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

diff --git a/src/w32-glib-io.c b/src/w32-glib-io.c
index a5af4e68..ddeb64b0 100644
--- a/src/w32-glib-io.c
+++ b/src/w32-glib-io.c
@@ -565,7 +565,7 @@ build_commandline (char **argv)
   /* And a trailing zero.  */
   n++;
 
-  buf = p = malloc (n);
+  buf = p = _gpgme_malloc (n);
   if (!buf)
     return NULL;
   for (i = 0; argv[i]; i++)
@@ -634,7 +634,7 @@ _gpgme_io_spawn (const char *path, char * const argv[], unsigned int flags,
     }
   TRACE_LOG1 ("tmp_name = %s", tmp_name);
 
-  args = calloc (2 + i + 1, sizeof (*args));
+  args = _gpgme_calloc (2 + i + 1, sizeof (*args));
   args[0] = (char *) _gpgme_get_w32spawn_path ();
   args[1] = tmp_name;
   args[2] = path;
@@ -645,7 +645,7 @@ _gpgme_io_spawn (const char *path, char * const argv[], unsigned int flags,
   sec_attr.bInheritHandle = FALSE;
 
   arg_string = build_commandline (args);
-  free (args);
+  _gpgme_free (args);
   if (!arg_string)
     {
       close (tmp_fd);
@@ -676,7 +676,7 @@ _gpgme_io_spawn (const char *path, char * const argv[], unsigned int flags,
 		       &pi))          /* returns process information */
     {
       TRACE_LOG1 ("CreateProcess failed: ec=%d", (int) GetLastError ());
-      free (arg_string);
+      _gpgme_free (arg_string);
       close (tmp_fd);
       DeleteFile (tmp_name);
 
@@ -685,7 +685,7 @@ _gpgme_io_spawn (const char *path, char * const argv[], unsigned int flags,
       return TRACE_SYSRES (-1);
     }
 
-  free (arg_string);
+  _gpgme_free (arg_string);
 
   if (flags & IOSPAWN_FLAG_ALLOW_SET_FG)
     _gpgme_allow_set_foreground_window ((pid_t)pi.dwProcessId);
@@ -826,13 +826,13 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
   if (nonblock)
     timeout = 0;
 
-  pollfds = calloc (nfds, sizeof *pollfds);
+  pollfds = _gpgme_calloc (nfds, sizeof *pollfds);
   if (!pollfds)
     return -1;
-  pollfds_map = calloc (nfds, sizeof *pollfds_map);
+  pollfds_map = _gpgme_calloc (nfds, sizeof *pollfds_map);
   if (!pollfds_map)
     {
-      free (pollfds);
+      _gpgme_free (pollfds);
       return -1;
     }
   npollfds = 0;
@@ -928,8 +928,8 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
     }
 
 leave:
-  free (pollfds);
-  free (pollfds_map);
+  _gpgme_free (pollfds);
+  _gpgme_free (pollfds_map);
   return TRACE_SYSRES (count);
 }