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

diff --git a/src/sig-notation.c b/src/sig-notation.c
index c747ad62..e18f54d8 100644
--- a/src/sig-notation.c
+++ b/src/sig-notation.c
@@ -31,6 +31,7 @@
 #include "context.h"
 #include "ops.h"
 #include "debug.h"
+#include "mem.h"
 
 
 /* Free the signature notation object and all associated resources.
@@ -40,12 +41,12 @@ void
 _gpgme_sig_notation_free (gpgme_sig_notation_t notation)
 {
   if (notation->name)
-    free (notation->name);
+    _gpgme_free (notation->name);
 
   if (notation->value)
-    free (notation->value);
+    _gpgme_free (notation->value);
 
-  free (notation);
+  _gpgme_free (notation);
 }
 
 
@@ -77,7 +78,7 @@ _gpgme_sig_notation_create (gpgme_sig_notation_t *notationp,
   if (name && !(flags & GPGME_SIG_NOTATION_HUMAN_READABLE))
     return gpg_error (GPG_ERR_INV_VALUE);
 
-  notation = calloc (1, sizeof (*notation));
+  notation = _gpgme_calloc (1, sizeof (*notation));
   if (!notation)
     return gpg_error_from_syserror ();
 
@@ -88,7 +89,7 @@ _gpgme_sig_notation_create (gpgme_sig_notation_t *notationp,
     {
       /* We add a trailing '\0' for stringification in the good
 	 case.  */
-      notation->name = malloc (name_len + 1);
+      notation->name = _gpgme_malloc (name_len + 1);
       if (!notation->name)
 	{
 	  err = gpg_error_from_syserror ();
@@ -104,7 +105,7 @@ _gpgme_sig_notation_create (gpgme_sig_notation_t *notationp,
     {
       /* We add a trailing '\0' for stringification in the good
 	 case.  */
-      notation->value = malloc (value_len + 1);
+      notation->value = _gpgme_malloc (value_len + 1);
       if (!notation->value)
 	{
 	  err = gpg_error_from_syserror ();
@@ -234,7 +235,7 @@ _gpgme_parse_notation (gpgme_sig_notation_t *notationp,
       /* Small sanity check.  */
       if (4 + 2 + 2 + name_len + value_len > len)
 	{
-	  free (decoded_data);
+	  _gpgme_free (decoded_data);
 	  return trace_gpg_error (GPG_ERR_INV_ENGINE);
 	}
 
@@ -256,6 +257,6 @@ _gpgme_parse_notation (gpgme_sig_notation_t *notationp,
   err = _gpgme_sig_notation_create (notationp, name, name_len,
 				    value, value_len, flags);
 
-  free (decoded_data);
+  _gpgme_free (decoded_data);
   return err;
 }