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/vasprintf.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/vasprintf.c')

diff --git a/src/vasprintf.c b/src/vasprintf.c
index 4c40131d..326a2c35 100644
--- a/src/vasprintf.c
+++ b/src/vasprintf.c
@@ -26,6 +26,8 @@ Boston, MA 02111-1307, USA.  */
 #include <stdlib.h>
 #include <stdarg.h>
 
+#include "mem.h"
+
 
 #ifndef va_copy /* According to POSIX, va_copy is a macro. */
 #if defined (__GNUC__) && defined (__PPC__) \
@@ -54,7 +56,7 @@ int_vasprintf (result, format, args)
 #ifdef HAVE_W32CE_SYSTEM
   /* No va_copy and the replacement above doesn't work.  */
 #define MAX_STRLEN 256
-  *result = malloc (MAX_STRLEN);
+  *result = _gpgme_malloc (MAX_STRLEN);
   if (*result != NULL)
     {
       int res = _vsnprintf (*result, MAX_STRLEN, format, *args);
@@ -141,7 +143,7 @@ int_vasprintf (result, format, args)
 #ifdef TEST
   global_total_width = total_width;
 #endif
-  *result = malloc (total_width);
+  *result = _gpgme_malloc (total_width);
   if (*result != NULL)
     return vsprintf (*result, format, *args);
   else
@@ -150,7 +152,7 @@ int_vasprintf (result, format, args)
 }
 
 int
-vasprintf (result, format, args)
+_gpgme_vasprintf (result, format, args)
      char **result;
      const char *format;
 #if defined (_BSD_VA_LIST_) && defined (__FreeBSD__)
@@ -164,13 +166,13 @@ vasprintf (result, format, args)
 
 
 int
-asprintf (char **buf, const char *fmt, ...)
+_gpgme_asprintf (char **buf, const char *fmt, ...)
 {
   int status;
   va_list ap;
 
   va_start (ap, fmt);
-  status = vasprintf (buf, fmt, ap);
+  status = _gpgme_vasprintf (buf, fmt, ap);
   va_end (ap);
   return status;
 }
@@ -184,7 +186,7 @@ checkit (const char* format, ...)
   char *result;
 
   va_start (args, format);
-  vasprintf (&result, format, args);
+  _gpgme_vasprintf (&result, format, args);
   if (strlen (result) < global_total_width)
     printf ("PASS: ");
   else
-- 
cgit v1.2.3