Bug #6026 <https://bugs.freedesktop.org/show_bug.cgi?id=6026> Segfault in

    netaddr.c:ConvertAddr if ifa_addr is NULL (Loser Mcloser
    <reebydobalina@yahoo.ca>)

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5981573..f62904f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-24  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* netaddr.c: 
+	Bug #6026 <https://bugs.freedesktop.org/show_bug.cgi?id=6026>
+	Segfault in netaddr.c:ConvertAddr if ifa_addr is NULL
+	(Loser Mcloser <reebydobalina@yahoo.ca>)
+
 2006-02-24  Jeremy C. Reed  <reed@reedmedia.net>
 
 	reviewed by: Alan.Coopersmith@Sun.COM
diff --git a/netaddr.c b/netaddr.c
index ec419e9..e5a22a8 100644
--- a/netaddr.c
+++ b/netaddr.c
@@ -155,7 +155,7 @@ int ConvertAddr (XdmcpNetaddr saddr, int *len, char **addr)
 {
     int retval;
 
-    if (len == NULL)
+    if ((len == NULL) || (saddr == NULL))
         return -1;
     *addr = NetaddrAddress(saddr, len);
 #ifdef STREAMSCONN