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, 4 insertions, 3 deletions

diff --git a/src/data-identify.c b/src/data-identify.c
index 96006335..46d96505 100644
--- a/src/data-identify.c
+++ b/src/data-identify.c
@@ -28,6 +28,7 @@
 #include "data.h"
 #include "util.h"
 #include "parsetlv.h"
+#include "mem.h"
 
 /* The size of the sample data we take for detection.  */
 #define SAMPLE_SIZE 2048
@@ -228,19 +229,19 @@ gpgme_data_identify (gpgme_data_t dh, int reserved)
     return GPGME_DATA_TYPE_INVALID;
 
   /* Allocate a buffer and read the data. */
-  sample = malloc (SAMPLE_SIZE);
+  sample = _gpgme_malloc (SAMPLE_SIZE);
   if (!sample)
     return GPGME_DATA_TYPE_INVALID; /* Ooops.  */
   n = gpgme_data_read (dh, sample, SAMPLE_SIZE - 1);
   if (n < 0)
     {
-      free (sample);
+      _gpgme_free (sample);
       return GPGME_DATA_TYPE_INVALID; /* Ooops.  */
     }
   sample[n] = 0;  /* (Required for our string functions.)  */
 
   result = basic_detection (sample, n);
-  free (sample);
+  _gpgme_free (sample);
   gpgme_data_seek (dh, off, SEEK_SET);
 
   return result;