From: Dennis Flynn <drflynn@avaya.com>
Date: Mon, 6 Apr 2015 14:59:19 +0000 (-0400)
Subject: auto-attach: Fix segfault when enabling auto attach.
X-Git-Tag: v2.4.0~377
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=660527a420c29bdbc0cddd51438980ee712ba591;p=cascardo%2Fovs.git

auto-attach: Fix segfault when enabling auto attach.

This commit fixes a segmentation fault observed when enabling lldp prior to
establishing auto attach mappings.

Signed-off-by: Dennis Flynn <drflynn@avaya.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/ovs-lldp.c b/lib/ovs-lldp.c
index db97648e6..f71b40ddb 100644
--- a/lib/ovs-lldp.c
+++ b/lib/ovs-lldp.c
@@ -483,12 +483,14 @@ aa_configure(const struct aa_settings *s)
         LIST_FOR_EACH (chassis, list, &lldp->lldpd->g_chassis) {
             /* System Description */
             free(chassis->c_descr);
-            chassis->c_descr = s->system_description[0] ?
+            chassis->c_descr = s && s->system_description[0] ?
                 xstrdup(s->system_description) : xstrdup(PACKAGE_STRING);
 
             /* System Name */
-            free(chassis->c_name);
-            chassis->c_name = xstrdup(s->system_name);
+            if (s) {
+                free(chassis->c_name);
+                chassis->c_name = xstrdup(s->system_name);
+            }
         }
     }