diff options
| author | Werner Koch <[email protected]> | 2009-05-19 22:39:45 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-05-19 22:39:45 +0000 |
| commit | 4fa261f8ecb16fabb4d06403f6ffacaa010ce453 (patch) | |
| tree | f2786955474b37c97172d5dbf932e17bc48a2543 /agent | |
| parent | Remove testing cruft. (diff) | |
| download | gnupg-4fa261f8ecb16fabb4d06403f6ffacaa010ce453.tar.gz gnupg-4fa261f8ecb16fabb4d06403f6ffacaa010ce453.zip | |
Fix possible system freeze on Mac OS X.
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 9a07219a4..8c9cefea6 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2009-05-19 Werner Koch <[email protected]> + + * gpg-agent.c (JNLIB_NEED_AFLOCAL): Define. + (create_server_socket): Use SUN_LEN macro. + 2009-05-15 Werner Koch <[email protected]> Fix bug #1053. diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index b5f9a47e2..7093ee1e6 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -39,6 +39,7 @@ #include <pth.h> #define JNLIB_NEED_LOG_LOGV +#define JNLIB_NEED_AFLOCAL #include "agent.h" #include <assuan.h> /* Malloc hooks and socket wrappers. */ @@ -1457,9 +1458,7 @@ create_server_socket (char *name, int is_ssh, assuan_sock_nonce_t *nonce) agent_exit (2); } strcpy (serv_addr->sun_path, name); - len = (offsetof (struct sockaddr_un, sun_path) - + strlen (serv_addr->sun_path) + 1); - + len = SUN_LEN (serv_addr); rc = assuan_sock_bind (fd, (struct sockaddr*) serv_addr, len); if (use_standard_socket && rc == -1 && errno == EADDRINUSE) { |