aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2009-09-29 13:48:15 +0000
committerWerner Koch <[email protected]>2009-09-29 13:48:15 +0000
commit134e9dbda53618fa3a8be464cabbf65cd27bf09d (patch)
tree9564541c0e23c8c24a830b87e399cc1120c47ecf
parent2009-09-19 Marcus Brinkmann <[email protected]> (diff)
downloadlibassuan-134e9dbda53618fa3a8be464cabbf65cd27bf09d.tar.gz
libassuan-134e9dbda53618fa3a8be464cabbf65cd27bf09d.zip
Allow apssing NULL to assuan_release.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/assuan.c15
2 files changed, 13 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 627d369..41253b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-29 Werner Koch <[email protected]>
+
+ * assuan.c (assuan_release): Allow passing a NULL ctx.
+
2009-09-19 Marcus Brinkmann <[email protected]>
* src/libassuan.vers, src/libassuan.def: Update to new API.
diff --git a/src/assuan.c b/src/assuan.c
index d2c9f17..06b9b8a 100644
--- a/src/assuan.c
+++ b/src/assuan.c
@@ -168,10 +168,13 @@ _assuan_reset (assuan_context_t ctx)
void
assuan_release (assuan_context_t ctx)
{
- TRACE (ctx, ASSUAN_LOG_CTX, "assuan_release", ctx);
-
- _assuan_reset (ctx);
- /* None of the members that are our responsibility requires
- deallocation. */
- _assuan_free (ctx, ctx);
+ if (ctx)
+ {
+ TRACE (ctx, ASSUAN_LOG_CTX, "assuan_release", ctx);
+
+ _assuan_reset (ctx);
+ /* None of the members that are our responsibility requires
+ deallocation. */
+ _assuan_free (ctx, ctx);
+ }
}