From aea2c168fc9c12148181dbcc33d7085aad8e6d90 Mon Sep 17 00:00:00 2001 From: Ben Kibbey 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/passphrase.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/passphrase.c') diff --git a/src/passphrase.c b/src/passphrase.c index 00e9d999..67b4ce69 100644 --- a/src/passphrase.c +++ b/src/passphrase.c @@ -33,6 +33,7 @@ #include "ops.h" #include "util.h" #include "debug.h" +#include "mem.h" typedef struct @@ -50,9 +51,9 @@ release_op_data (void *hook) op_data_t opd = (op_data_t) hook; if (opd->passphrase_info) - free (opd->passphrase_info); + _gpgme_free (opd->passphrase_info); if (opd->uid_hint) - free (opd->uid_hint); + _gpgme_free (opd->uid_hint); } @@ -75,8 +76,8 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code, { case GPGME_STATUS_USERID_HINT: if (opd->uid_hint) - free (opd->uid_hint); - if (!(opd->uid_hint = strdup (args))) + _gpgme_free (opd->uid_hint); + if (!(opd->uid_hint = _gpgme_strdup (args))) return gpg_error_from_syserror (); break; @@ -94,8 +95,8 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code, case GPGME_STATUS_NEED_PASSPHRASE_SYM: case GPGME_STATUS_NEED_PASSPHRASE_PIN: if (opd->passphrase_info) - free (opd->passphrase_info); - opd->passphrase_info = strdup (args); + _gpgme_free (opd->passphrase_info); + opd->passphrase_info = _gpgme_strdup (args); if (!opd->passphrase_info) return gpg_error_from_syserror (); break; -- cgit v1.2.3