From: JuanJo Ciarlante <jjo@google.com>
Date: Mon, 5 Oct 2009 12:44:20 +0000 (+0200)
Subject: * fixed segfault for undef address family in print_sockaddr_ex (thanks Marcel!)
X-Git-Tag: v2.3-alpha1~240^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4af2d42d85e619e508645682bef3904f5d6e39af;p=thirdparty%2Fopenvpn.git

* fixed segfault for undef address family in print_sockaddr_ex (thanks Marcel!)
---

diff --git a/socket.c b/socket.c
index 943cb5824..52b7b6884 100644
--- a/socket.c
+++ b/socket.c
@@ -2384,10 +2384,10 @@ print_sockaddr_ex (const struct openvpn_sockaddr *addr,
 {
   struct buffer out = alloc_buf_gc (128, gc);
   bool addr_is_defined;
-  if (!addr) {
-    return "[NULL]";
+  addr_is_defined = addr_defined (addr);
+  if (!addr_is_defined) {
+    return "[undef]";
   }
-  addr_is_defined =  addr_defined (addr);
 #ifdef USE_PF_INET6
   switch(addr->addr.sa.sa_family)
     {
@@ -2414,7 +2414,7 @@ print_sockaddr_ex (const struct openvpn_sockaddr *addr,
     case AF_INET6:
 	{
 	  const int port= ntohs (addr->addr.in6.sin6_port);
-	  char buf[INET6_ADDRSTRLEN] = "[undef]";
+	  char buf[INET6_ADDRSTRLEN] = "";
 	  buf_puts (&out, "[AF_INET6]");
 	  if (addr_is_defined)
 	    {