diff options
author | Dennis Flynn <drflynn@avaya.com> | 2015-04-06 10:59:19 -0400 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2015-04-06 13:04:38 -0700 |
commit | 660527a420c29bdbc0cddd51438980ee712ba591 (patch) | |
tree | a3224252edf84d60ef734cf0bbfda09c5d41fb34 /lib/ovs-lldp.c | |
parent | 6c6045a72a93f72317567cc6075ac306ef0a3c44 (diff) | |
download | openvswitch-660527a420c29bdbc0cddd51438980ee712ba591.tar.gz |
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>
Diffstat (limited to 'lib/ovs-lldp.c')
-rw-r--r-- | lib/ovs-lldp.c | 8 |
1 files changed, 5 insertions, 3 deletions
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); + } } } |