security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Fixed segv in gpg-agent (command marktrusted).

Browse source 
Replaced almost all free by xfree.
Translation fixes.
This commit is contained in:
Werner Koch 2008-05-27 12:03:50 +00:00
parent 3d39dc13d0
commit 138bf2dc15
46 changed files with 194 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/ChangeLog
View file

@ -1,3 +1,13 @@
2008-05-26 Werner Koch <wk@g10code.com>
* asshelp.c (send_one_option, send_pinentry_environment): use
xfree and xtrystrdup.
* i18n.c (i18n_switchto_utf8) [USE_SIMPLE_GETTEXT]: Return NULL.
* homedir.c (gnupg_module_name): Add
GNUPG_MODULE_NAME_CONNECT_AGENT and GNUPG_MODULE_NAME_GPGCONF.
2008-04-21 Werner Koch <wk@g10code.com>
* http.c (http_wait_response) [W32]: Use DuplicateHandle because

10
common/asshelp.c
View file

@ -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)

6
common/homedir.c
View file

@ -383,6 +383,12 @@ gnupg_module_name (int which)
case GNUPG_MODULE_NAME_GPG:
X(bindir, "gpg2");
case GNUPG_MODULE_NAME_CONNECT_AGENT:
X(bindir, "gpg-connect-agent");
case GNUPG_MODULE_NAME_GPGCONF:
X(bindir, "gpgconf");
default:
BUG ();
}

2
common/i18n.c
View file

@ -52,6 +52,7 @@ i18n_switchto_utf8 (void)
{
#ifdef USE_SIMPLE_GETTEXT
gettext_select_utf8 (1);
return NULL;
#elif defined(ENABLE_NLS)
char *orig_codeset = bind_textdomain_codeset (PACKAGE_GT, NULL);
# ifdef HAVE_LANGINFO_CODESET
@ -81,6 +82,7 @@ void
i18n_switchback (char *saved_codeset)
{
#ifdef USE_SIMPLE_GETTEXT
(void)saved_codeset;
gettext_select_utf8 (0);
#elif defined(ENABLE_NLS)
if (saved_codeset)

2
common/util.h
View file

@ -194,6 +194,8 @@ const char *dirmngr_socket_name (void);
#define GNUPG_MODULE_NAME_CHECK_PATTERN 6
#define GNUPG_MODULE_NAME_GPGSM 7
#define GNUPG_MODULE_NAME_GPG 8
#define GNUPG_MODULE_NAME_CONNECT_AGENT 9
#define GNUPG_MODULE_NAME_GPGCONF 10
const char *gnupg_module_name (int which);