Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread (8ad30b5b) · Commits · e / os / android_frameworks_base

libs/utils/ZipFileRO.cpp

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);