commit fc17d9022bfa6dcb734ce7cdf5893c9b51dea8bb
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jul 09 03:38:18 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 09 03:38:18 2016 +0000
tree c68e6ef95756f7ce4155ce92196f4e63c3a96df3
parent e8708a3314c130d83f80891e7a7285b67fb64083
parent fea78952d08306474af70f1e2096384c8e43ea86

Merge "Fix clang static analyzer on potential memory leak."

dexdump/DexDump.cpp

diff --git a/dexdump/DexDump.cpp b/dexdump/DexDump.cpp
index d3735d6..b186bbd 100644
--- a/dexdump/DexDump.cpp
+++ b/dexdump/DexDump.cpp
@@ -709,9 +709,13 @@
  * this can be compared with the one passed in, to see if the result
  * needs to be free()d.
  */
-static char* indexString(DexFile* pDexFile,
-    const DecodedInstruction* pDecInsn, char* buf, size_t bufSize)
+static char* indexString(DexFile* pDexFile, const DecodedInstruction* pDecInsn, size_t bufSize)
 {
+    char* buf = (char*)malloc(bufSize);
+    if (buf == NULL) {
+      return NULL;
+    }
+
     int outSize;
     u4 index;
     u4 width;
@@ -833,12 +837,8 @@
          * snprintf() doesn't count the '\0' as part of its returned
          * size, so we add explicit space for it here.
          */
-        outSize++;
-        buf = (char*)malloc(outSize);
-        if (buf == NULL) {
-            return NULL;
-        }
-        return indexString(pDexFile, pDecInsn, buf, outSize);
+        free(buf);
+        return indexString(pDexFile, pDecInsn, outSize + 1);
     } else {
         return buf;
     }
@@ -850,8 +850,6 @@
 void dumpInstruction(DexFile* pDexFile, const DexCode* pCode, int insnIdx,
     int insnWidth, const DecodedInstruction* pDecInsn)
 {
-    char indexBufChars[200];
-    char *indexBuf = indexBufChars;
     const u2* insns = pCode->insns;
     int i;
 
@@ -890,9 +888,11 @@
         printf("|%04x: %s", insnIdx, dexGetOpcodeName(pDecInsn->opcode));
     }
 
+    // Provide an initial buffer that usually suffices, although indexString()
+    // may reallocate the buffer if more space is needed.
+    char* indexBuf = NULL;
     if (pDecInsn->indexType != kIndexNone) {
-        indexBuf = indexString(pDexFile, pDecInsn,
-                indexBufChars, sizeof(indexBufChars));
+        indexBuf = indexString(pDexFile, pDecInsn, 200);
     }
 
     switch (dexGetFormatFromOpcode(pDecInsn->opcode)) {
@@ -1049,9 +1049,7 @@
 
     putchar('\n');
 
-    if (indexBuf != indexBufChars) {
-        free(indexBuf);
-    }
+    free(indexBuf);
 }
 
 /*