summaryrefslogtreecommitdiffstats
path: root/common/asshelp.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2008-05-27 14:03:50 +0200
committerWerner Koch <wk@gnupg.org>2008-05-27 14:03:50 +0200
commit138bf2dc1552fe8b8a1da6edcbd9fdcb747a73b9 (patch)
tree2dd4b1c251b4802660287496b4fd688bb4d7e0c5 /common/asshelp.c
parentMinor bug fixes and document new gpg-connect-feature. (diff)
downloadgnupg2-138bf2dc1552fe8b8a1da6edcbd9fdcb747a73b9.tar.xz
gnupg2-138bf2dc1552fe8b8a1da6edcbd9fdcb747a73b9.zip
Fixed segv in gpg-agent (command marktrusted).
Replaced almost all free by xfree. Translation fixes.
Diffstat (limited to 'common/asshelp.c')
-rw-r--r--common/asshelp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/asshelp.c b/common/asshelp.c
index 8274d88a7..99da71a22 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -49,7 +49,7 @@ send_one_option (assuan_context_t ctx, gpg_err_source_t errsource,
else
{
err = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL);
- free (optstr);
+ xfree (optstr);
}
return err;
@@ -119,7 +119,7 @@ send_pinentry_environment (assuan_context_t ctx,
old_lc = setlocale (LC_CTYPE, NULL);
if (old_lc)
{
- old_lc = strdup (old_lc);
+ old_lc = xtrystrdup (old_lc);
if (!old_lc)
return gpg_error_from_syserror ();
}
@@ -134,7 +134,7 @@ send_pinentry_environment (assuan_context_t ctx,
if (old_lc)
{
setlocale (LC_CTYPE, old_lc);
- free (old_lc);
+ xfree (old_lc);
}
#endif
if (err)
@@ -145,7 +145,7 @@ send_pinentry_environment (assuan_context_t ctx,
old_lc = setlocale (LC_MESSAGES, NULL);
if (old_lc)
{
- old_lc = strdup (old_lc);
+ old_lc = xtrystrdup (old_lc);
if (!old_lc)
return gpg_error_from_syserror ();
}
@@ -160,7 +160,7 @@ send_pinentry_environment (assuan_context_t ctx,
if (old_lc)
{
setlocale (LC_MESSAGES, old_lc);
- free (old_lc);
+ xfree (old_lc);
}
#endif
if (err)