diff options
Diffstat (limited to 'src/engine-g13.c')
| -rw-r--r-- | src/engine-g13.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/engine-g13.c b/src/engine-g13.c index a9717eec..76f0cd3f 100644 --- a/src/engine-g13.c +++ b/src/engine-g13.c @@ -50,6 +50,8 @@ #include "engine-backend.h" +#include "mem.h" + typedef struct { @@ -207,7 +209,7 @@ g13_release (void *engine) g13_cancel (engine); - free (g13); + _gpgme_free (g13); } @@ -224,7 +226,7 @@ g13_new (void **engine, const char *file_name, const char *home_dir) char *dft_ttytype = NULL; char *optstr; - g13 = calloc (1, sizeof *g13); + g13 = _gpgme_calloc (1, sizeof *g13); if (!g13) return gpg_error_from_syserror (); @@ -266,17 +268,17 @@ g13_new (void **engine, const char *file_name, const char *home_dir) goto leave; if (dft_display) { - if (asprintf (&optstr, "OPTION display=%s", dft_display) < 0) + if (_gpgme_asprintf (&optstr, "OPTION display=%s", dft_display) < 0) { - free (dft_display); + _gpgme_free (dft_display); err = gpg_error_from_syserror (); goto leave; } - free (dft_display); + _gpgme_free (dft_display); err = assuan_transact (g13->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - free (optstr); + _gpgme_free (optstr); if (err) goto leave; } @@ -293,14 +295,14 @@ g13_new (void **engine, const char *file_name, const char *home_dir) } else { - if (asprintf (&optstr, "OPTION ttyname=%s", dft_ttyname) < 0) + if (_gpgme_asprintf (&optstr, "OPTION ttyname=%s", dft_ttyname) < 0) { err = gpg_error_from_syserror (); goto leave; } err = assuan_transact (g13->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - free (optstr); + _gpgme_free (optstr); if (err) goto leave; @@ -309,17 +311,17 @@ g13_new (void **engine, const char *file_name, const char *home_dir) goto leave; if (dft_ttytype) { - if (asprintf (&optstr, "OPTION ttytype=%s", dft_ttytype) < 0) + if (_gpgme_asprintf (&optstr, "OPTION ttytype=%s", dft_ttytype) < 0) { - free (dft_ttytype); + _gpgme_free (dft_ttytype); err = gpg_error_from_syserror (); goto leave; } - free (dft_ttytype); + _gpgme_free (dft_ttytype); err = assuan_transact (g13->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - free (optstr); + _gpgme_free (optstr); if (err) goto leave; } @@ -389,13 +391,13 @@ g13_set_locale (void *engine, int category, const char *value) if (!value) return 0; - if (asprintf (&optstr, "OPTION %s=%s", catstr, value) < 0) + if (_gpgme_asprintf (&optstr, "OPTION %s=%s", catstr, value) < 0) err = gpg_error_from_syserror (); else { err = assuan_transact (g13->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - free (optstr); + _gpgme_free (optstr); } return err; |