diff options
| author | Werner Koch <[email protected]> | 2016-07-13 13:11:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-07-13 13:11:46 +0000 |
| commit | 4ef62278e3c9406360dc50288f422291497e218f (patch) | |
| tree | fff3a49be5c2659ab87195e5b0a4f88e51a49205 /common/simple-pwquery.c | |
| parent | Merge branch 'master' into STABLE-BRANCH-2-2 (diff) | |
| parent | gpg: New option --mimemode. (diff) | |
| download | gnupg-4ef62278e3c9406360dc50288f422291497e218f.tar.gz gnupg-4ef62278e3c9406360dc50288f422291497e218f.zip | |
Merge branch 'master' into STABLE-BRANCH-2-2
--
Diffstat (limited to '')
| -rw-r--r-- | common/simple-pwquery.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c index bdad14093..708b1573d 100644 --- a/common/simple-pwquery.c +++ b/common/simple-pwquery.c @@ -340,6 +340,7 @@ agent_open (int *rfd) if ( !(p = strchr ( infostr, PATHSEP_C)) || p == infostr || (p-infostr)+1 >= sizeof client_addr.sun_path ) { + spwq_free (infostr); return SPWQ_NO_AGENT; } *p++ = 0; @@ -357,12 +358,14 @@ agent_open (int *rfd) #ifdef SPWQ_USE_LOGGING log_error ("can't create socket: %s\n", strerror(errno) ); #endif + spwq_free (infostr); return SPWQ_SYS_ERROR; } memset (&client_addr, 0, sizeof client_addr); client_addr.sun_family = AF_UNIX; strcpy (client_addr.sun_path, infostr); + spwq_free (infostr); len = SUN_LEN (&client_addr); #ifdef HAVE_W32_SYSTEM @@ -373,7 +376,8 @@ agent_open (int *rfd) if (rc == -1) { #ifdef SPWQ_USE_LOGGING - log_error ( _("can't connect to '%s': %s\n"), infostr, strerror (errno)); + log_error (_("can't connect to '%s': %s\n"), + client_addr.sun_path, strerror (errno)); #endif close (fd ); return SPWQ_IO_ERROR; |