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, 12 insertions, 11 deletions

diff --git a/src/vfs-mount.c b/src/vfs-mount.c
index b9b1b4d2..5f0a196e 100644
--- a/src/vfs-mount.c
+++ b/src/vfs-mount.c
@@ -29,6 +29,7 @@
 #include "context.h"
 #include "ops.h"
 #include "util.h"
+#include "mem.h"
 
 typedef struct
 {
@@ -71,8 +72,8 @@ _gpgme_vfs_mount_status_handler (void *priv, const char *code, const char *args)
   if (! strcasecmp ("MOUNTPOINT", code))
     {
       if (opd->result.mount_dir)
-	free (opd->result.mount_dir);
-      opd->result.mount_dir = strdup (args);
+	_gpgme_free (opd->result.mount_dir);
+      opd->result.mount_dir = _gpgme_strdup (args);
     }
 
   return 0;
@@ -182,17 +183,17 @@ _gpgme_op_vfs_mount (gpgme_ctx_t ctx, const char *container_file,
   if (err)
     return err;
 
-  if (asprintf (&cmd, "OPEN -- %s", container_file_esc) < 0)
+  if (_gpgme_asprintf (&cmd, "OPEN -- %s", container_file_esc) < 0)
     {
       err = gpg_error_from_syserror ();
-      free (container_file_esc);
+      _gpgme_free (container_file_esc);
       return err;
     }
-  free (container_file_esc);
+  _gpgme_free (container_file_esc);
 
   err = gpgme_op_vfs_transact (ctx, cmd, NULL, NULL, NULL, NULL,
 			       NULL, NULL, op_err);
-  free (cmd);
+  _gpgme_free (cmd);
   if (err || *op_err)
     return err;
 
@@ -204,23 +205,23 @@ _gpgme_op_vfs_mount (gpgme_ctx_t ctx, const char *container_file,
       if (err)
 	return err;
 
-      if (asprintf (&cmd, "MOUNT -- %s", mount_dir_esc) < 0)
+      if (_gpgme_asprintf (&cmd, "MOUNT -- %s", mount_dir_esc) < 0)
 	{
 	  err = gpg_error_from_syserror ();
-	  free (mount_dir_esc);
+	  _gpgme_free (mount_dir_esc);
 	  return err;
 	}
-      free (mount_dir_esc);
+      _gpgme_free (mount_dir_esc);
     }
   else
     {
-      if (asprintf (&cmd, "MOUNT") < 0)
+      if (_gpgme_asprintf (&cmd, "MOUNT") < 0)
 	return gpg_error_from_syserror ();
     }
 
   err = gpgme_op_vfs_transact (ctx, cmd, NULL, NULL, NULL, NULL,
 			       _gpgme_vfs_mount_status_handler, ctx, op_err);
-  free (cmd);
+  _gpgme_free (cmd);
 
   return err;
 }