aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/camel-gpg-context.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 4300a6a310..a24189bd76 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-02 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #51478.
+
+ * camel-gpg-context.c (gpg_ctx_free): handle the context being
+ NULL, and exit silently.
+
2003-12-01 Jeffrey Stedfast <fejj@ximian.com>
* camel-process.c (camel_process_fork): Start at fd = 3.
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index 4b7f39dd7e..237540a381 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -386,7 +386,10 @@ static void
gpg_ctx_free (struct _GpgCtx *gpg)
{
int i;
-
+
+ if (gpg == NULL)
+ return;
+
if (gpg->session)
camel_object_unref (gpg->session);