Add gpgme_set_global_malloc_hooks().

* configure.ac: Remove check for vasprintf().
* doc/gpgme.texi: Add documentation.
* src/gpgme.h.in (gpgme_malloc_hooks,gpgme_malloc_hooks_t): New.
* src/gpgme.h.in (gpgme_set_global_malloc_hooks): New prototype.
* src/mem.c, src/mem.h: New.
* src/gpgme.c (gpgme_set_global_malloc_hooks): New.
* src/gpgme.def, src/libgpgme.vers: Add gpgme_set_global_malloc_hooks.
* src/vasprintf.c (vasprintf): Rename to _gpgme_vasprintf().
* src/vasprintf.c (asprintf): Rename to _gpgme_asprintf().
* src/Makefile.am: Add mem.c, mem.h and vasprintf.c to main_sources.
* src/assuan-support.c, src/ath-pthread.c, src/conversion.c,
src/data-compat.c, src/data-identify.c, src/data-mem.c, src/data.c,
src/debug.c, src/decrypt.c, src/dirinfo.c, src/encrypt.c,
src/engine-assuan.c, src/engine-g13.c, src/engine-gpg.c,
src/engine-gpgconf.c, src/engine-gpgsm.c, src/engine-spawn.c,
src/engine-uiserver.c, src/engine.c, src/export.c, src/genkey.c,
src/get-env.c, src/gpgme-w32spawn.c, src/gpgme.c, src/import.c,
src/key.c, src/keylist.c, src/op-support.c, src/passphrase.c,
src/posix-io.c, src/posix-util.c, src/progress.c, src/setenv.c,
src/sig-notation.c, src/sign.c, src/signers.c, src/trust-item.c,
src/trustlist.c, src/util.h, src/verify.c, src/version.c,
src/vfs-create.c, src/vfs-mount.c, src/w32-ce.c, src/w32-ce.h,
src/w32-glib-io.c, src/w32-io.c, src/w32-sema.c, src/w32-util.c,
src/wait-global.c, src/wait.c:
Change allocation functions: free() to _gpgme_free(), malloc() to
_gpgme_malloc(), calloc() to _gpgme_calloc(), realloc() to
_gpgme_realloc() and strdup() to _gpgme_strdup().

--
Mostly borrowed from libassuan for custom memory handling. This changes
vasprintf.c to implement _gpgme_asprintf() and _gpgme_vasprintf() and
will always use the built-in vasprintf() even when provided by the OS.

1 files changed, 15 insertions, 14 deletions

diff --git a/src/debug.c b/src/debug.c
index ca0bb21a..a50b4487 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -47,6 +47,7 @@
 #include "ath.h"
 #include "sema.h"
 #include "debug.h"
+#include "mem.h"
 
 
 /* Lock to serialize initialization of the debug output subsystem and
@@ -122,8 +123,8 @@ trim_spaces (char *str)
 int
 _gpgme_debug_set_debug_envvar (const char *value)
 {
-  free (envvar_override);
-  envvar_override = strdup (value);
+  _gpgme_free (envvar_override);
+  envvar_override = _gpgme_strdup (value);
   return !envvar_override;
 }
 
@@ -142,8 +143,8 @@ debug_init (void)
 
       if (envvar_override)
         {
-          e = strdup (envvar_override);
-          free (envvar_override);
+          e = _gpgme_strdup (envvar_override);
+          _gpgme_free (envvar_override);
           envvar_override = NULL;
         }
       else
@@ -182,7 +183,7 @@ debug_init (void)
 		  s1++;
 		  if (!(s2 = strchr (s1, PATHSEP_C)))
 		    s2 = s1 + strlen (s1);
-		  p = malloc (s2 - s1 + 1);
+		  p = _gpgme_malloc (s2 - s1 + 1);
 		  if (p)
 		    {
 		      memcpy (p, s1, s2 - s1);
@@ -194,13 +195,13 @@ debug_init (void)
 			  setvbuf (fp, NULL, _IOLBF, 0);
 			  errfp = fp;
 			}
-		      free (p);
+		      _gpgme_free (p);
 		    }
 #ifndef HAVE_DOSISH_SYSTEM
 		}
 #endif
 	    }
-	  free (e);
+	  _gpgme_free (e);
         }
     }
   UNLOCK (debug_lock);
@@ -292,7 +293,7 @@ _gpgme_debug_begin (void **line, int level, const char *format, ...)
     }
 
   va_start (arg_ptr, format);
-  res = vasprintf ((char **) line, format, arg_ptr);
+  res = _gpgme_vasprintf ((char **) line, format, arg_ptr);
   va_end (arg_ptr);
   if (res < 0)
     *line = NULL;
@@ -312,16 +313,16 @@ _gpgme_debug_add (void **line, const char *format, ...)
     return;
 
   va_start (arg_ptr, format);
-  res = vasprintf (&toadd, format, arg_ptr);
+  res = _gpgme_vasprintf (&toadd, format, arg_ptr);
   va_end (arg_ptr);
   if (res < 0)
     {
-      free (*line);
+      _gpgme_free (*line);
       *line = NULL;
     }
-  res = asprintf (&result, "%s%s", *(char **) line, toadd);
-  free (toadd);
-  free (*line);
+  res = _gpgme_asprintf (&result, "%s%s", *(char **) line, toadd);
+  _gpgme_free (toadd);
+  _gpgme_free (*line);
   if (res < 0)
     *line = NULL;
   else
@@ -340,7 +341,7 @@ _gpgme_debug_end (void **line)
   /* The smallest possible level is 1, so force logging here by
      using that.  */
   _gpgme_debug (1, "%s", *line);
-  free (*line);
+  _gpgme_free (*line);
   *line = NULL;
 }