From 139ead15efb498c0d11f7745e709d457c9ec5e0b Mon Sep 17 00:00:00 2001
From: Dmitry-Me <wipedout@yandex.ru>
Date: Tue, 1 Sep 2015 16:17:17 +0300
Subject: [PATCH] Merge overlapping patterns

---
 lib/checkbufferoverrun.cpp | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index 219777411..60ed72a6e 100644
--- a/lib/checkbufferoverrun.cpp
+++ b/lib/checkbufferoverrun.cpp
@@ -674,23 +674,25 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
 
         if (total_size > 0) {
             // Writing data into array..
-            if ((declarationId > 0 && Token::Match(tok, "strcpy|strcat ( %varid% , %str% )", declarationId)) ||
-                (declarationId == 0 && Token::Match(tok, ("strcpy|strcat ( " + varnames + " , %str% )").c_str()))) {
-                const std::size_t len = Token::getStrLength(tok->tokAt(varcount + 4));
-                if (len >= (unsigned int)total_size) {
-                    bufferOverrunError(tok, declarationId > 0 ? emptyString : varnames);
-                    continue;
-                }
-            } else if ((declarationId > 0 && Token::Match(tok, "strcpy|strcat ( %varid% , %var% )", declarationId)) ||
-                       (declarationId == 0 && Token::Match(tok, ("strcpy|strcat ( " + varnames + " , %var% )").c_str()))) {
-                const Variable *var = tok->tokAt(varcount + 4)->variable();
-                if (var && var->isArray() && var->dimensions().size() == 1) {
-                    const MathLib::bigint len = var->dimension(0);
-                    if (len > total_size) {
-                        if (printInconclusive)
-                            possibleBufferOverrunError(tok, tok->strAt(4), tok->strAt(2), tok->str() == "strcat");
+            if ((declarationId > 0 && Token::Match(tok, "strcpy|strcat ( %varid% , %str%|%var% )", declarationId)) ||
+                (declarationId == 0 && Token::Match(tok, ("strcpy|strcat ( " + varnames + " , %str%|%var% )").c_str()))) {
+                const Token* lastParamTok = tok->tokAt(varcount + 4);
+                if (lastParamTok->tokType() == Token::Type::eString) {
+                    const std::size_t len = Token::getStrLength(lastParamTok);
+                    if (len >= (unsigned int)total_size) {
+                        bufferOverrunError(tok, declarationId > 0 ? emptyString : varnames);
                         continue;
                     }
+                } else {
+                    const Variable *var = lastParamTok->variable();
+                    if (var && var->isArray() && var->dimensions().size() == 1) {
+                        const MathLib::bigint len = var->dimension(0);
+                        if (len > total_size) {
+                            if (printInconclusive)
+                                possibleBufferOverrunError(tok, tok->strAt(4), tok->strAt(2), tok->str() == "strcat");
+                            continue;
+                        }
+                    }
                 }
             }