From: Vincent Bernat <bernat@luffy.cx>
Date: Wed, 2 Nov 2011 14:25:09 +0000 (+0100)
Subject: Fix a segfault when neither /etc/os-release not lsb_release is available.
X-Git-Tag: 0.5.5~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf89e7e064678bddb9c75306c195948c0e7fb4ac;p=thirdparty%2Flldpd.git

Fix a segfault when neither /etc/os-release not lsb_release is available.

Closes #11.
---

diff --git a/CHANGELOG b/CHANGELOG
index f95002d0..29f02f6e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@ lldpd (0.5.5)
     + Only grab DMI information once. Only uses DMI for x86 platform.
     + Padding issues with socket protocol. This introduces a change in
       the socket protocol!
+    + Fix a segfault when neither /etc/os-release nor lsb_release
+      are available.
 
 lldpd (0.5.4)
   * Features:
diff --git a/src/lldpd.c b/src/lldpd.c
index f3e0d16e..36ff4d83 100644
--- a/src/lldpd.c
+++ b/src/lldpd.c
@@ -1289,7 +1289,7 @@ lldpd_main(int argc, char *argv[])
 	cfg->g_delay = LLDPD_TX_DELAY;
 
 	/* Description */
-	if (!(cfg->g_advertise_version = advertise_version))
+	if (!(cfg->g_advertise_version = advertise_version) && lsb_release)
 		/* Remove the \n */
 		lsb_release[strlen(lsb_release) - 1] = '\0';
 	cfg->g_lsb_release = lsb_release;