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, 24 insertions, 5 deletions

diff --git a/src/assuan-support.c b/src/assuan-support.c
index 745d2aa5..99a73a7a 100644
--- a/src/assuan-support.c
+++ b/src/assuan-support.c
@@ -12,13 +12,32 @@
 #include "ath.h"
 #include "priv-io.h"
 #include "debug.h"
+#include "mem.h"
 
 
+static void *
+_gpgme_assuan_malloc (size_t size)
+{
+  return _gpgme_malloc (size);
+}
+
+static void *
+_gpgme_assuan_realloc (void *p, size_t size)
+{
+  return _gpgme_realloc (p, size);
+}
+
+static void
+_gpgme_assuan_free (void *p)
+{
+  _gpgme_free (p);
+}
+
 struct assuan_malloc_hooks _gpgme_assuan_malloc_hooks =
   {
-    malloc,
-    realloc,
-    free
+    _gpgme_assuan_malloc,
+    _gpgme_assuan_realloc,
+    _gpgme_assuan_free
   };
 
 
@@ -140,7 +159,7 @@ my_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
     }
   /* fd_in, fd_out, terminator */
   i += 3;
-  fd_items = calloc (i, sizeof (struct spawn_fd_item_s));
+  fd_items = _gpgme_calloc (i, sizeof (struct spawn_fd_item_s));
   if (! fd_items)
     return -1;
   i = 0;
@@ -184,7 +203,7 @@ my_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
 	    }
 	}
     }
-  free (fd_items);
+  _gpgme_free (fd_items);
   return err;
 }