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, 13 insertions, 12 deletions

diff --git a/src/verify.c b/src/verify.c
index 37b2bd46..04299c78 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -32,6 +32,7 @@
 #include "util.h"
 #include "context.h"
 #include "ops.h"
+#include "mem.h"
 
 
 typedef struct
@@ -65,15 +66,15 @@ release_op_data (void *hook)
 	}
 
       if (sig->fpr)
-	free (sig->fpr);
+	_gpgme_free (sig->fpr);
       if (sig->pka_address)
-	free (sig->pka_address);
-      free (sig);
+	_gpgme_free (sig->pka_address);
+      _gpgme_free (sig);
       sig = next;
     }
 
   if (opd->result.file_name)
-    free (opd->result.file_name);
+    _gpgme_free (opd->result.file_name);
 }
 
 
@@ -249,7 +250,7 @@ prepare_new_sig (op_data_t opd)
     }
   else
     {
-      sig = calloc (1, sizeof (*sig));
+      sig = _gpgme_calloc (1, sizeof (*sig));
       if (!sig)
         return gpg_error_from_syserror ();
       if (!opd->result.signatures)
@@ -385,7 +386,7 @@ parse_new_sig (op_data_t opd, gpgme_status_code_t code, char *args,
 
   if (*args)
     {
-      sig->fpr = strdup (args);
+      sig->fpr = _gpgme_strdup (args);
       if (!sig->fpr)
 	return gpg_error_from_syserror ();
     }
@@ -408,8 +409,8 @@ parse_valid_sig (gpgme_signature_t sig, char *args, gpgme_protocol_t protocol)
     return gpg_error (GPG_ERR_GENERAL);
 
   if (sig->fpr)
-    free (sig->fpr);
-  sig->fpr = strdup (args);
+    _gpgme_free (sig->fpr);
+  sig->fpr = _gpgme_strdup (args);
   if (!sig->fpr)
     return gpg_error_from_syserror ();
 
@@ -550,14 +551,14 @@ parse_notation (gpgme_signature_t sig, gpgme_status_code_t code, char *args)
 
       if (!notation->value)
 	{
-	  dest = notation->value = malloc (len);
+	  dest = notation->value = _gpgme_malloc (len);
 	  if (!dest)
 	    return gpg_error_from_syserror ();
 	}
       else
 	{
 	  int cur_len = strlen (notation->value);
-	  dest = realloc (notation->value, len + strlen (notation->value));
+	  dest = _gpgme_realloc (notation->value, len + strlen (notation->value));
 	  if (!dest)
 	    return gpg_error_from_syserror ();
 	  notation->value = dest;
@@ -753,7 +754,7 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
       end = strchr (args, ' ');
       if (end)
         *end = 0;
-      sig->pka_address = strdup (args);
+      sig->pka_address = _gpgme_strdup (args);
       break;
 
     case GPGME_STATUS_ERROR:
@@ -784,7 +785,7 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
             }
           /* Note that there is no need to release the members of SIG
              because we won't be here if they have been set. */
-          free (sig);
+          _gpgme_free (sig);
           opd->current_sig = NULL;
         }
       opd->only_newsig_seen = 0;