Remove simplification in combineOperators() (#6900)

Caused inconsistent results in #6889
danmar · Oct 11, 2024 · 0dbc7c8 · 0dbc7c8
1 parent 20f8a74
commit 0dbc7c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -824,7 +824,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
 
                 else if (tok3->str() == "}") {
                     if (indentlevel3 == 0) {
-                        memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), allocType);
+                        memoryLeak(tok3, variable->name() + "." + assignToks.first->str(), allocType);
                         break;
                     }
                     --indentlevel3;

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -3605,17 +3605,8 @@ void Tokenizer::combineOperators()
                 tok->deleteNext();
             }
         } else if (tok->str() == "->") {
-            // If the preceding sequence is "( & %name% )", replace it by "%name%"
-            Token *t = tok->tokAt(-4);
-            if (Token::Match(t, "( & %name% )") && !Token::simpleMatch(t->previous(), ">")) {
-                t->deleteThis();
-                t->deleteThis();
-                t->deleteNext();
-                tok->str(".");
-            } else {
-                tok->str(".");
-                tok->originalName("->");
-            }
+            tok->str(".");
+            tok->originalName("->");
         }
     }
 }

diff --git a/test/cfg/bsd.c b/test/cfg/bsd.c
@@ -68,10 +68,11 @@ ssize_t nullPointer_pwritev(int fd, const struct iovec *iov, int iovcnt, off_t o
     return pwritev(fd,iov,iovcnt,offset);
 }
 
-// False negative: #9346
+// #9346
 void uninitvar_timercmp(struct timeval t)
 {
     struct timeval uninit;
+    // cppcheck-suppress uninitvar
     (void)timercmp(&t, &uninit, <);
     (void)timercmp(&uninit, &t, <=);
     (void)timercmp(&uninit, &uninit, ==);