From aea2c168fc9c12148181dbcc33d7085aad8e6d90 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Fri, 10 Oct 2014 09:02:09 -0400
Subject: 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.
---
 src/engine-spawn.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/engine-spawn.c')

diff --git a/src/engine-spawn.c b/src/engine-spawn.c
index 8ffc6280..c2d0846d 100644
--- a/src/engine-spawn.c
+++ b/src/engine-spawn.c
@@ -42,6 +42,7 @@
 #include "debug.h"
 
 #include "engine-backend.h"
+#include "mem.h"
 
 
 /* This type is used to build a list of data sources/sinks.  */
@@ -120,7 +121,7 @@ add_data (engine_spawn_t esp, gpgme_data_t data, int dup_to, int inbound)
   assert (esp);
   assert (data);
 
-  a = malloc (sizeof *a - 1);
+  a = _gpgme_malloc (sizeof *a - 1);
   if (!a)
     return gpg_error_from_syserror ();
   a->next = NULL;
@@ -149,7 +150,7 @@ free_fd_data_map (struct fd_data_map_s *fd_data_map)
 	_gpgme_io_close (fd_data_map[i].peer_fd);
       /* Don't release data because this is only a reference.  */
     }
-  free (fd_data_map);
+  _gpgme_free (fd_data_map);
 }
 
 
@@ -165,7 +166,7 @@ build_fd_data_map (engine_spawn_t esp)
       datac++;
 
   free_fd_data_map (esp->fd_data_map);
-  esp->fd_data_map = calloc (datac + 1, sizeof *esp->fd_data_map);
+  esp->fd_data_map = _gpgme_calloc (datac + 1, sizeof *esp->fd_data_map);
   if (!esp->fd_data_map)
     return gpg_error_from_syserror ();
 
@@ -175,7 +176,7 @@ build_fd_data_map (engine_spawn_t esp)
 
       if (_gpgme_io_pipe (fds, a->inbound ? 1 : 0) == -1)
         {
-          free (esp->fd_data_map);
+          _gpgme_free (esp->fd_data_map);
           esp->fd_data_map = NULL;
           return gpg_error_from_syserror ();
         }
@@ -250,7 +251,7 @@ engspawn_start (engine_spawn_t esp, const char *file, const char *argv[],
   n = 0;
   for (i = 0; esp->fd_data_map[i].data; i++)
     n++;
-  fd_list = calloc (n+1, sizeof *fd_list);
+  fd_list = _gpgme_calloc (n+1, sizeof *fd_list);
   if (!fd_list)
     return gpg_error_from_syserror ();
 
@@ -274,7 +275,7 @@ engspawn_start (engine_spawn_t esp, const char *file, const char *argv[],
                             fd_list, NULL, NULL, &pid);
   if (save_argv0)
     argv[0] = save_argv0;
-  free (fd_list);
+  _gpgme_free (fd_list);
   if (status == -1)
     return gpg_error_from_syserror ();
 
@@ -312,7 +313,7 @@ static char *
 engspawn_get_version (const char *file_name)
 {
   (void)file_name;
-  return strdup ("1.0");
+  return _gpgme_strdup ("1.0");
 }
 
 
@@ -331,7 +332,7 @@ engspawn_new (void **engine, const char *file_name, const char *home_dir)
   (void)file_name;
   (void)home_dir;
 
-  esp = calloc (1, sizeof *esp);
+  esp = _gpgme_calloc (1, sizeof *esp);
   if (!esp)
     return gpg_error_from_syserror ();
 
@@ -356,11 +357,11 @@ engspawn_release (void *engine)
       struct datalist_s *next = esp->arglist->next;
 
       if (esp->arglist)
-	free (esp->arglist);
+	_gpgme_free (esp->arglist);
       esp->arglist = next;
     }
 
-  free (esp);
+  _gpgme_free (esp);
 }
 
 
-- 
cgit v1.2.3