commit bfac08e47db21634161398169e638d8b6fbd7373
author Dan Bornstein <danfuzz@android.com> Wed Dec 15 16:37:48 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 15 16:37:48 2010 -0800
tree 55681318f1e3d6ef72a8f7f9675f078cf65c3249
parent cf415424fda3d321aedb4f891b5373b547b02cbe
parent 734ff82ff55be8083fe78f96ac950e2252b1ea28

am 734ff82f: Merge "Initialize my field."

* commit '734ff82ff55be8083fe78f96ac950e2252b1ea28':
  Initialize my field.

vm/native/dalvik_system_DexFile.c

diff --git a/vm/native/dalvik_system_DexFile.c b/vm/native/dalvik_system_DexFile.c
index 3a3846e..59f5d57 100644
--- a/vm/native/dalvik_system_DexFile.c
+++ b/vm/native/dalvik_system_DexFile.c
@@ -200,12 +200,14 @@
         pDexOrJar = (DexOrJar*) malloc(sizeof(DexOrJar));
         pDexOrJar->isDex = true;
         pDexOrJar->pRawDexFile = pRawDexFile;
+        pDexOrJar->pDexMemory = NULL;
     } else if (dvmJarFileOpen(sourceName, outputName, &pJarFile, false) == 0) {
         LOGV("Opening DEX file '%s' (Jar)\n", sourceName);
 
         pDexOrJar = (DexOrJar*) malloc(sizeof(DexOrJar));
         pDexOrJar->isDex = false;
         pDexOrJar->pJarFile = pJarFile;
+        pDexOrJar->pDexMemory = NULL;
     } else {
         LOGV("Unable to open DEX file '%s'\n", sourceName);
         dvmThrowException("Ljava/io/IOException;", "unable to open DEX file");