]> git.puffer.fish Git - matthieu/frr.git/commitdiff
lib: parser: guard yylloc
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 24 Jan 2017 01:51:00 +0000 (02:51 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 24 Jan 2017 01:52:07 +0000 (02:52 +0100)
yylloc seems to be NULL on parser init for some flex+bison
combinations...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
lib/command_lex.l

index 703596b43dbf26cc92b4f1f56371afe6699e195d..2a241abbec679966a6ae6b4652bd0a69073b0f68 100644 (file)
 #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\*]*