From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 22 Jun 2012 13:25:24 +0000 (-0400)
Subject: CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT: Handle NULL gracefully.
X-Git-Tag: upstream/3.7.4~741
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfd18887c45bef066daf833c9086e230789af526;p=platform%2Fupstream%2Fevolution-data-server.git

CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT: Handle NULL gracefully.

Evaluates to FALSE if the 'provider' pointer is NULL.
---

diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 571e5f9..73e0c74 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -96,7 +96,10 @@ typedef enum {
 	CAMEL_URL_PATH_IS_ABSOLUTE = 1 << 31,
 } CamelProviderURLFlags;
 
-#define CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT(prov) (prov->object_types[CAMEL_PROVIDER_STORE] && prov->object_types[CAMEL_PROVIDER_TRANSPORT])
+#define CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT(provider) \
+	((provider != NULL) && \
+	((provider->object_types[CAMEL_PROVIDER_STORE] != G_TYPE_INVALID) && \
+	((provider->object_types[CAMEL_PROVIDER_TRANSPORT] != G_TYPE_INVALID)
 
 /* Generic extra config stuff */