summaryrefslogtreecommitdiffstats
path: root/vm/oo/Class.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'vm/oo/Class.cpp')
-rw-r--r--vm/oo/Class.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/vm/oo/Class.cpp b/vm/oo/Class.cpp
index db5340ef5..904d53db5 100644
--- a/vm/oo/Class.cpp
+++ b/vm/oo/Class.cpp
@@ -23,6 +23,7 @@
#include "Dalvik.h"
#include "libdex/DexClass.h"
+#include "libdex/ZipArchive.h"
#include "analysis/Optimize.h"
#include <stdlib.h>
@@ -886,6 +887,7 @@ StringObject* dvmGetBootPathResource(const char* name, int idx)
const int kUrlOverhead = 13; // worst case for Jar URL
const ClassPathEntry* cpe = gDvm.bootClassPath;
StringObject* urlObj = NULL;
+ ZipEntry entry;
ALOGV("+++ searching for resource '%s' in %d(%s)",
name, idx, cpe[idx].fileName);
@@ -904,7 +906,7 @@ StringObject* dvmGetBootPathResource(const char* name, int idx)
case kCpeJar:
{
JarFile* pJarFile = (JarFile*) cpe->ptr;
- if (dexZipFindEntry(&pJarFile->archive, name) == NULL)
+ if (dexZipFindEntry(pJarFile->archive, name, &entry) != 0)
goto bail;
sprintf(urlBuf, "jar:file://%s!/%s", cpe->fileName, name);
}