From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 24 Jan 2017 01:51:00 +0000 (+0100)
Subject: lib: parser: guard yylloc
X-Git-Tag: frr-3.0-branchpoint~64^2~7^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=14152706b42699d5665cd5291637730841e41b94;p=matthieu%2Ffrr.git

lib: parser: guard yylloc

yylloc seems to be NULL on parser init for some flex+bison
combinations...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/lib/command_lex.l b/lib/command_lex.l
index 703596b43d..2a241abbec 100644
--- a/lib/command_lex.l
+++ b/lib/command_lex.l
@@ -26,9 +26,10 @@
 #include "command_parse.h"
 
 #define YY_USER_ACTION yylloc->last_column += yyleng;
-#define LOC_STEP \
+#define LOC_STEP do { if (yylloc) { \
         yylloc->first_column = yylloc->last_column; \
-        yylloc->first_line = yylloc->last_line;
+        yylloc->first_line = yylloc->last_line; \
+	} } while(0)
 %}
 
 WORD            (\-|\+)?[a-z0-9\*][-+_a-zA-Z0-9\*]*