commit 85c3817a5db06781e8be8e3a8fe0ea675f15ada6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 02 16:37:24 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 02 16:37:24 2017 +0000
tree 58fab1bc0853a4e11dc40fd7df3d818c4ca4f34c
parent dfdc080699f1bf92978b45e8e87649bde239a874
parent 6ed5b87f24e00d36c11ceb2f2894417a56dcd69c

Merge "dexdump: fix a static analyzer complaint"

dexdump/DexDump.cpp

diff --git a/dexdump/DexDump.cpp b/dexdump/DexDump.cpp
index 7a20c29..8dbdd22 100644
--- a/dexdump/DexDump.cpp
+++ b/dexdump/DexDump.cpp
@@ -738,7 +738,8 @@
             return false;
         }
         const char* param = dexStringByTypeIdx(pDexFile, paramTypes->list[i].typeIdx);
-        size_t newUsed = bufUsed + strlen(param);
+        size_t paramLen = strlen(param);
+        size_t newUsed = bufUsed + paramLen;
         if (newUsed > bufSize) {
             char* newBuf = (char*)realloc(buf, newUsed);
             if (newBuf == NULL) {
@@ -748,7 +749,7 @@
             buf = newBuf;
             bufSize = newUsed;
         }
-        strncat(buf + bufUsed - 1, param, bufSize - (bufUsed - 1));
+        memcpy(buf + bufUsed - 1, param, paramLen + 1);
         bufUsed = newUsed;
     }