diff --git a/CheckBufferOverrun.cpp b/CheckBufferOverrun.cpp
index a257563ab..90c9ff47a 100644
--- a/CheckBufferOverrun.cpp
+++ b/CheckBufferOverrun.cpp
@@ -48,6 +48,8 @@ TOKEN *findfunction(TOKEN *tok)
 // Writing dynamic data in buffer without bounds checking
 //---------------------------------------------------------------------------
 
+extern bool ShowWarnings;
+
 static void _DynamicDataCheck(TOKEN *ftok, TOKEN *tok)
 {
     const char *var2 = tok->str;
@@ -67,10 +69,31 @@ static void _DynamicDataCheck(TOKEN *ftok, TOKEN *tok)
                 break;
             }
         }
-        if (strcmp(tok2->str,var2)==0)
+        if (match(tok2,"char var [ ]"))
         {
-            Var2Count++;
-            break;
+            decl |= (strcmp(getstr(tok2,1),var2)==0);
+            tok2 = gettok(tok2,3);
+        }
+
+        // If ShowWarnings, only strlen(var2) counts
+        if ( ShowWarnings )
+        {
+            if (match(tok2,"strlen ( var )") &&
+                strcmp(getstr(tok2,2),var2)==0)
+            {
+                Var2Count++;
+                break;
+            }
+        }
+
+        // If not ShowWarnings, all usage of "var2" counts
+        else
+        {
+            if (strcmp(tok2->str,var2)==0)
+            {
+                Var2Count++;
+                break;
+            }
         }
     }
 
diff --git a/main.cpp b/main.cpp
index 8d1ad497f..63c8b5bf2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,7 +16,7 @@
 
 //---------------------------------------------------------------------------
 bool Debug = false;
-static bool ShowWarnings = false;
+bool ShowWarnings = false;
 //---------------------------------------------------------------------------
 
 static void CppCheck(const char FileName[]);
diff --git a/testbufferoverrun7/err.msg b/testbufferoverrun7/err.msg
index 5ea0a6270..86cac18ef 100644
--- a/testbufferoverrun7/err.msg
+++ b/testbufferoverrun7/err.msg
@@ -1,3 +1,4 @@
 [testbufferoverrun7\testbufferoverrun7.cpp:5]: A string with unknown length is copied to buffer.
 [testbufferoverrun7\testbufferoverrun7.cpp:10]: A string with unknown length is copied to buffer.
 [testbufferoverrun7\testbufferoverrun7.cpp:15]: A string with unknown length is copied to buffer.
+[testbufferoverrun7\testbufferoverrun7.cpp:20]: A string with unknown length is copied to buffer.
diff --git a/testbufferoverrun7/testbufferoverrun7.cpp b/testbufferoverrun7/testbufferoverrun7.cpp
index 56f36eda1..1482d3a0d 100644
--- a/testbufferoverrun7/testbufferoverrun7.cpp
+++ b/testbufferoverrun7/testbufferoverrun7.cpp
@@ -14,3 +14,8 @@ void f3(char *str)
 {
     sprintf(buf,"%s",str);
 }
+
+void f4(const char str[])
+{
+    strcpy(buf, str);
+}