walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #9208 (MISRA addon crashes on enum with constant expression)

This commit is contained in:
Daniel Marjamäki 2019-08-04 12:24:28 +02:00
parent 7ebc9d1b5f
commit 996000da52
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/misra.py
View File

@ -925,7 +925,7 @@ class MisraChecker:
e_token = scope.bodyStart.next e_token = scope.bodyStart.next
while e_token != scope.bodyEnd: while e_token != scope.bodyEnd:
if e_token.str == '(': if e_token.str == '(':
e_token.str = e_token.link e_token = e_token.link
continue continue
if not e_token.previous.str in ',{': if not e_token.previous.str in ',{':
e_token = e_token.next e_token = e_token.next

3
addons/test/misra/misra-test.c
View File

@ -1,5 +1,5 @@
// To test: // To test:
// ~/cppcheck/cppcheck --dump misra-test.c && python ../misra.py -verify misra-test.c.dump // ~/cppcheck/cppcheck --dump misra-test.c && python ../../misra.py -verify misra-test.c.dump
#include "path\file.h" // 20.2 #include "path\file.h" // 20.2
#include /*abc*/ "file.h" // no warning #include /*abc*/ "file.h" // no warning
@ -153,6 +153,7 @@ enum misra_8_12_a { misra_a1 = 1, misra_a2 = 2, misra_a3, misra_a4 = 3 }; //8.12
enum misra_8_12_b { misra_b1, misra_b2, misra_b3 = 3, misra_b4 = 3 }; // no-warning enum misra_8_12_b { misra_b1, misra_b2, misra_b3 = 3, misra_b4 = 3 }; // no-warning
enum misra_8_12_c { misra_c1 = misra_a1, misra_c2 = 1 }; // no-warning enum misra_8_12_c { misra_c1 = misra_a1, misra_c2 = 1 }; // no-warning
enum misra_8_12_d { misra_d1 = 1, misra_d2 = 2, misra_d3 = misra_d1 }; // no-warning enum misra_8_12_d { misra_d1 = 1, misra_d2 = 2, misra_d3 = misra_d1 }; // no-warning
enum misra_8_12_e { misra_e1 = sizeof(int), misra_e2}; // no-crash
void misra_8_14(char * restrict str) {} // 8.14 void misra_8_14(char * restrict str) {} // 8.14