Skip to content

misra.py: Fix rule 21.1 false positives #2526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 1 commit into from
Feb 9, 2020
Merged

misra.py: Fix rule 21.1 false positives #2526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions addons/misra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2084,35 +2084,6 @@ def misra_21_1(self, data):
if res:
self.reportError(directive, 21, 1)

type_name_tokens = (t for t in data.tokenlist if t.typeScopeId)
type_fields_tokens = (t for t in data.tokenlist if t.valueType and t.valueType.typeScopeId)

# Search for forbidden identifiers
for i in itertools.chain(data.variables, data.functions, type_name_tokens, type_fields_tokens):
token = i
if isinstance(i, cppcheckdata.Variable):
token = i.nameToken
elif isinstance(i, cppcheckdata.Function):
token = i.tokenDef
if not token:
continue
if len(token.str) < 2:
continue
if token.str == 'errno':
self.reportError(token, 21, 1)
if token.str[0] == '_':
if (token.str[1] in string.ascii_uppercase) or (token.str[1] == '_'):
self.reportError(token, 21, 1)

# Allow identifiers with file scope visibility (static)
if token.scope.type == 'Global':
if token.variable and token.variable.isStatic:
continue
if token.function and token.function.isStatic:
continue

self.reportError(token, 21, 1)

def misra_21_3(self, data):
for token in data.tokenlist:
if isFunctionCall(token) and (token.astOperand1.str in ('malloc', 'calloc', 'realloc', 'free')):
Expand Down
40 changes: 1 addition & 39 deletions addons/test/misra/misra-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,53 +982,15 @@ union misra_19_2 { }; // 19.2
#define _macro_starts_with_lower 1 // no warning
static int _file_scope_id_21_1 = 42; // no warning
static int _file_scope_id_21_1_fn() { return 42; } // no warning
static int __file_scope_id_21_1 = 42; // 21.1
static int __file_scope_id_21_1_fn() { return 42; } // 21.1
static int _File_scope_id_21_1 = 42; // 21.1
static int _File_scope_id_21_1_fn() { return 42; } // 21.1
int _external_scope_id_21_1 = 42; // 21.1
int _external_scope_id_21_1_fn() { return 42; } // 21.1
int __external_scope_id_21_1 = 42; // 21.1
int __external_scope_id_21_1_fn() { return 42; } // 21.1
int _External_scope_id_21_1 = 42; // 21.1
int _External_scope_id_21_1_fn() { return 42; } // 21.1
int errno = 42; // 21.1 5.5
int misra_21_1() {
int _a = 42; // 21.1
int _a = 42; // no warning: only directives affected
errno = EINVAL; // no warning
_a ++; // no warning
_exit(1); // no warning
return _a; // no warning
}
int _misra_21_1_1(); // 21.1
static int _misra_21_1_2(); // no warning
#define errno 11 // 21.1
struct _struct_21_1 { int a; }; // 21.1
struct _Struct_21_1 { int a; }; // 21.1
struct __struct_21_1 { int a; }; // 21.1
typedef struct { int a; } _struct_21_1_t; // 21.1
typedef struct { int a; } _Struct_21_1_t; // 21.1
typedef struct { int a; } __struct_21_1_t; // 21.1
enum _enum_21_1 { ENUM211_1 }; // 21.1
enum _Enum_21_1 { ENUM211_2 }; // 21.1
enum __enum_21_1 { ENUM211_3 }; // 21.1
enum __enum_21_1 { ENUM211_3 }; // 21.1
typedef enum { ENUM211_4 } _enum_21_1_t; // 21.1
typedef enum { ENUM211_5 } _Enum_21_1_t; // 21.1
typedef enum { ENUM211_6 } __enum_21_1_t; // 21.1
enum enum_21_1_valid_id {
ENUM211_7,
_ENUM211_8, // 21.1
__ENUM211_9, // 21.1
_eNUM211_10, // 21.1
enum211_11
};
union _union_21_1 { int a; }; // 21.1 19.2
union _Union_21_1 { int a; }; // 21.1 19.2
union __union_21_1 { int a; }; // 21.1 19.2
typedef union { int a; } _union_21_1_t; // 21.1 19.2
typedef union { int a; } _Union_21_1_t; // 21.1 19.2
typedef union { int a; } __union_21_1_t; // 21.1 19.2

void misra_21_3() {
p1=malloc(10); // 21.3
Expand Down