[openchange] Add patch for OpenChange bug #397 (crash under MAPIUninitialize)

[Milan Crha]

commit c9f51dad66e57f8726bedb58188cbae2c31dd647
Author: Milan Crha <mcrha at redhat.com>
Date:   Tue Jul 10 12:10:13 2012 +0200

    Add patch for OpenChange bug #397 (crash under MAPIUninitialize)

 openchange-1.0-uninit-crash.patch |   23 +++++++++++++++++++++++
 openchange.spec                   |    9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/openchange-1.0-uninit-crash.patch b/openchange-1.0-uninit-crash.patch
new file mode 100644
index 0000000..7d6c665
--- /dev/null
+++ b/openchange-1.0-uninit-crash.patch
@@ -0,0 +1,23 @@
+diff -up openchange-1.0-BORG/libmapi/emsmdb.c.uninit-crash openchange-1.0-BORG/libmapi/emsmdb.c
+--- openchange-1.0-BORG/libmapi/emsmdb.c.uninit-crash	2012-03-13 17:58:28.000000000 +0100
++++ openchange-1.0-BORG/libmapi/emsmdb.c	2012-07-10 12:05:26.453775843 +0200
+@@ -271,6 +271,10 @@ int emsmdb_disconnect_dtor(void *data)
+ 	struct emsmdb_context	*emsmdb_ctx;
+ 
+ 	emsmdb_ctx = (struct emsmdb_context *)provider->ctx;
++
++	if (!emsmdb_ctx)
++		return MAPI_E_SUCCESS;
++
+ 	emsmdb_disconnect(emsmdb_ctx);	
+ 
+ 	talloc_free(emsmdb_ctx->cache_requests);
+@@ -283,7 +287,7 @@ int emsmdb_disconnect_dtor(void *data)
+ 		talloc_free(emsmdb_ctx->info.szDNPrefix);
+ 	}
+ 
+-	return 0;
++	return MAPI_E_SUCCESS;
+ }
+ 
+ 
diff --git a/openchange.spec b/openchange.spec
index 8a05e23..929db7f 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -19,7 +19,7 @@
 
 Name: openchange
 Version: 1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -68,6 +68,9 @@ Patch2: openchange-1.0-popt.patch
 
 Patch3: openchange-1.0-OC_RULE_ADD-fix.patch
 
+# http://tracker.openchange.org/issues/397
+Patch4: openchange-1.0-uninit-crash.patch
+
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
@@ -130,6 +133,7 @@ This package provides the server elements for OpenChange.
 %patch1 -p1 -b .generate-xml-doc
 %patch2 -p1 -b .popt
 %patch3 -p1 -b .OC_RULE_ADD-fix
+%patch4 -p1 -b .uninit-crash
 
 %build
 ./autogen.sh
@@ -267,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Jul 10 2012 Milan Crha <mcrha at redhat.com> - 1.0-8
+- Add patch for OpenChange bug #397 (crash under MAPIUninitialize)
+
 * Fri Jun 01 2012 Milan Crha <mcrha at redhat.com> - 1.0-7
 - Add patch to use system's popt.h
 - Add patch to compile only certain parts of the package