Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread

Browse Source
This commit is contained in:
Kenny Root
2010-10-22 07:55:44 -07:00
committed by Android (Google) Code Review
parent 1257d330dc 0b22423878
commit 8ad30b5b7e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/utils/ZipFileRO.cpp
View File

@@ -412,10 +412,18 @@ void ZipFileRO::addToHash(const char* str, int strLen, unsigned int hash)
/* /*
* Find a matching entry. * Find a matching entry.
* *
* Returns 0 if not found. * Returns NULL if not found.
*/ */
ZipEntryRO ZipFileRO::findEntryByName(const char* fileName) const ZipEntryRO ZipFileRO::findEntryByName(const char* fileName) const
{ {
/*
* If the ZipFileRO instance is not initialized, the entry number will
* end up being garbage since mHashTableSize is -1.
*/
if (mHashTableSize <= 0) {
return NULL;
}
int nameLen = strlen(fileName); int nameLen = strlen(fileName);
unsigned int hash = computeHash(fileName, nameLen); unsigned int hash = computeHash(fileName, nameLen);
int ent = hash & (mHashTableSize-1); int ent = hash & (mHashTableSize-1);