From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 21 Nov 2013 20:08:05 +0000 (+0100)
Subject: Fix assertion when SIGUSR1 is received while getaddrinfo is successful
X-Git-Tag: v2.3.3~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47a963681a6ed18d32405ec26b74d56925425093;p=thirdparty%2Fopenvpn.git

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>
(cherry picked from commit 282788a835f6c9dfb85e8f9a3bd45f5841271b06)
---

diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 85f783af8..708903c99 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -208,18 +208,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;
+                    }
                 }
             }