diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-11-21 21:08:05 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-11-24 20:20:40 +0100 |
| commit | 282788a835f6c9dfb85e8f9a3bd45f5841271b06 (patch) | |
| tree | 40075644431c412e4f537cd05f7b79c25c052e97 /src/openvpn/socket.c | |
| parent | 8c19087034cb1076874075b9e2896ea3f7be59cf (diff) | |
| download | openvpn-282788a835f6c9dfb85e8f9a3bd45f5841271b06.tar.gz openvpn-282788a835f6c9dfb85e8f9a3bd45f5841271b06.tar.xz openvpn-282788a835f6c9dfb85e8f9a3bd45f5841271b06.zip | |
Fix assertion when SIGUSR1 is received while getaddrinfo is successful
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1385064495-25877-4-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8019
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/socket.c')
| -rw-r--r-- | src/openvpn/socket.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 6c50197..db711e1 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -227,18 +227,20 @@ openvpn_getaddrinfo (unsigned int flags, get_signal (signal_received); if (*signal_received) /* were we interrupted by a signal? */ { - if (0 == status) { - ASSERT(res); - freeaddrinfo(*res); - res = NULL; - } if (*signal_received == SIGUSR1) /* ignore SIGUSR1 */ { msg (level, "RESOLVE: Ignored SIGUSR1 signal received during DNS resolution attempt"); *signal_received = 0; } else - goto done; + { + if (0 == status) { + ASSERT(res); + freeaddrinfo(*res); + res = NULL; + } + goto done; + } } } |