doc/

2006-09-25  Marcus Brinkmann  <marcus@g10code.de>

        * gpgme.texi (Destroying Data Buffers): Clarify that
        gpgme_data_release_and_get_mem destroys DH unconditionally.

gpgme/
2006-09-25  Marcus Brinkmann  <marcus@g10code.de>

        * data-mem.c (gpgme_data_release_and_get_mem): Release the data
        object properly.

diff --git a/trunk/NEWS b/trunk/NEWS
index 05ed1039be5084454b53b9b7f352b95cbf63063b..f4f85c0e01a7aa3babd0bb10530a9ee63979d901 100644 (file)
--- a/trunk/NEWS
+++ b/trunk/NEWS
@@ -1,6 +1,8 @@
 Noteworthy changes in version 1.1.3 (unreleased)
 ------------------------------------------------
 
+ * Fixed a memory leak in gpgme_data_release_and_get_mem.
+
  * Interface changes relative to the 1.1.1 release:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/trunk/doc/ChangeLog b/trunk/doc/ChangeLog
index ebe0aa4a50ec0a02a23e946e5d483977e15e1141..759c2891b62f9b0bc666f20d34f364783e6ae1d4 100644 (file)
--- a/trunk/doc/ChangeLog
+++ b/trunk/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-25  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme.texi (Destroying Data Buffers): Clarify that
+       gpgme_data_release_and_get_mem destroys DH unconditionally.
+
 2005-03-24  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.texi (Library Version Check): Make example code compatible

diff --git a/trunk/doc/gpgme.texi b/trunk/doc/gpgme.texi
index 5053645dcbae3ff9e8b2929c87ea07befb52717e..04deff313cb55ebf6ac1bdb97580a4388b7d22fe 100644 (file)
--- a/trunk/doc/gpgme.texi
+++ b/trunk/doc/gpgme.texi
@@ -1719,7 +1719,8 @@ the user provided the data buffer in non-copy mode, a copy will be
 made for this purpose.
 
 In case an error returns, or there is no suitable data buffer that can
-be returned to the user, the function will return @code{NULL}.
+be returned to the user, the function will return @code{NULL}.  In any
+case, the data object @var{dh} is destroyed.
 @end deftypefun
 
 

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 63be9462615333fd6254e0323b7294899c7e33e1..6f27890b54bf4db54ded33f6d78e8d50a901ffed 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-25  Marcus Brinkmann  <marcus@g10code.de>
+
+       * data-mem.c (gpgme_data_release_and_get_mem): Release the data
+       object properly.
+
 2006-09-22  Marcus Brinkmann  <marcus@g10code.de>
 
        * keylist.c (keylist_colon_handler): Move debug output after

diff --git a/trunk/gpgme/data-mem.c b/trunk/gpgme/data-mem.c
index d0896debb9a26c5a69213a8572a4d2b286dd92a8..6e948ee00f5fcc6485c9e250fc97c5d434f3509c 100644 (file)
--- a/trunk/gpgme/data-mem.c
+++ b/trunk/gpgme/data-mem.c
@@ -210,20 +210,32 @@ gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len)
   char *str = NULL;
 
   if (!dh || dh->cbs != &mem_cbs)
-    return NULL;
+    {
+      gpgme_data_release (dh);
+      return NULL;
+    }
 
   str = dh->data.mem.buffer;
   if (!str && dh->data.mem.orig_buffer)
     {
       str = malloc (dh->data.mem.length);
       if (!str)
-       return NULL;
+       {
+         gpgme_data_release (dh);
+         return NULL;
+       }
       memcpy (str, dh->data.mem.orig_buffer, dh->data.mem.length);
     }
+  else
+    /* Prevent mem_release from releasing the buffer memory.  We must
+       not fail from this point.  */
+    dh->data.mem.buffer = NULL;
 
   if (r_len)
     *r_len = dh->data.mem.length;
 
+  gpgme_data_release (dh);
+
   return str;
 }