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, 8 insertions, 7 deletions

diff --git a/src/dirinfo.c b/src/dirinfo.c
index 8824c9a4..4e138561 100644
--- a/src/dirinfo.c
+++ b/src/dirinfo.c
@@ -30,6 +30,7 @@
 #include "debug.h"
 #include "sema.h"
 #include "sys-util.h"
+#include "mem.h"
 
 DEFINE_STATIC_LOCK (dirinfo_lock);
 
@@ -101,11 +102,11 @@ parse_output (char *line, int components)
   if (components)
     {
       if (!strcmp (line, "gpg") && !dirinfo.gpg_name)
-        dirinfo.gpg_name = strdup (value);
+        dirinfo.gpg_name = _gpgme_strdup (value);
       else if (!strcmp (line, "gpgsm") && !dirinfo.gpgsm_name)
-        dirinfo.gpgsm_name = strdup (value);
+        dirinfo.gpgsm_name = _gpgme_strdup (value);
       else if (!strcmp (line, "g13") && !dirinfo.g13_name)
-        dirinfo.g13_name = strdup (value);
+        dirinfo.g13_name = _gpgme_strdup (value);
     }
   else
     {
@@ -113,10 +114,10 @@ parse_output (char *line, int components)
         {
           const char name[] = "S.uiserver";
 
-          dirinfo.homedir = strdup (value);
+          dirinfo.homedir = _gpgme_strdup (value);
           if (dirinfo.homedir)
             {
-              dirinfo.uisrv_socket = malloc (strlen (dirinfo
+              dirinfo.uisrv_socket = _gpgme_malloc (strlen (dirinfo
                                                      .homedir)
                                              + 1 + strlen (name) + 1);
               if (dirinfo.uisrv_socket)
@@ -125,7 +126,7 @@ parse_output (char *line, int components)
             }
         }
       else if (!strcmp (line, "agent-socket") && !dirinfo.agent_socket)
-        dirinfo.agent_socket = strdup (value);
+        dirinfo.agent_socket = _gpgme_strdup (value);
     }
 }
 
@@ -216,7 +217,7 @@ get_gpgconf_item (int what)
         {
           _gpgme_debug (DEBUG_INIT,
                         "gpgme-dinfo: gpgconf='%s' [not installed]\n", pgmname);
-          free (pgmname);
+          _gpgme_free (pgmname);
           pgmname = NULL; /* Not available.  */
         }
       else