misra 9.2: do not crash when checking. string literal is allowed to i…

…nitialize array member.
danmar · Jul 10, 2023 · 652648b · 652648b
1 parent 2cd1f0f
commit 652648b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/addons/misra_9.py b/addons/misra_9.py
@@ -255,11 +255,21 @@ def parseInitializer(self, root, token):
                 isFirstElement = False
                 isDesignated = True
 
-            elif self.token.str == '{':
+            elif self.token.str == '{' or self.token.isString:
                 nextChild = self.root.getNextChild() if self.root is not None else None
 
                 if nextChild:
-                    if nextChild.isArray or nextChild.isRecord:
+                    if nextChild.isArray and self.token.isString:
+                        # Zero initializer causes recursive initialization
+                        nextChild.setInitialized(isDesignated)
+                        if self.token == self.token.astParent.astOperand1 and self.token.astParent.astOperand2:
+                            self.token = self.token.astParent.astOperand2
+                            self.ed.markAsCurrent()
+                            self.ed = self.root.getNextChild()
+                        else:
+                            self.unwindAndContinue()
+                        continue
+                    elif nextChild.isArray or nextChild.isRecord:
                         nextChild.unset()
                         nextChild.setInitialized(isDesignated)
                         self.ed = nextChild.getFirstValueElement()

diff --git a/addons/test/misra/crash6.c b/addons/test/misra/crash6.c
@@ -0,0 +1,17 @@
+
+
+typedef	struct _tGames
+{
+    char magicdirname[10];
+    unsigned int expectedmask;
+    unsigned char pictureorder[3];
+} tGames;
+
+static const tGames games[1]={
+    {"Pawn", 1, {0,1,2}}
+};
+
+
+
+
+