wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 972606, part 1 - Convert nsJAR::mManifestData to nsClassHashtable. r=aklotz

Browse Source
This commit is contained in:
Andrew McCreight 2014-02-25 20:32:48 -08:00
parent 5755a671a7
commit 65df5219b4
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/libjar/nsJAR.cpp
View File

@ -72,17 +72,10 @@ nsJARManifestItem::~nsJARManifestItem()
//----------------------------------------------
// nsJAR constructor/destructor
//----------------------------------------------
static bool
DeleteManifestEntry(nsHashKey* aKey, void* aData, void* closure)
{
//-- deletes an entry in mManifestData.
delete (nsJARManifestItem*)aData;
return true;
}
// The following initialization makes a guess of 10 entries per jarfile.
nsJAR::nsJAR(): mZip(new nsZipArchive()),
mManifestData(nullptr, nullptr, DeleteManifestEntry, nullptr, 10),
mManifestData(10),
mParsedManifest(false),
mGlobalStatus(JAR_MANIFEST_NOT_PARSED),
mReleaseTime(PR_INTERVAL_NO_TIMEOUT),
@ -189,7 +182,7 @@ nsJAR::Close()
{
mOpened = false;
mParsedManifest = false;
mManifestData.Reset();
mManifestData.Clear();
mGlobalStatus = JAR_MANIFEST_NOT_PARSED;
mTotalItemsInManifest = 0;
@ -359,8 +352,7 @@ nsJAR::GetCertificatePrincipal(const nsACString &aFilename, nsICertificatePrinci
if (!aFilename.IsEmpty())
{
//-- Find the item
nsCStringKey key(aFilename);
nsJARManifestItem* manItem = static_cast<nsJARManifestItem*>(mManifestData.Get(&key));
nsJARManifestItem* manItem = mManifestData.Get(aFilename);
if (!manItem)
return NS_OK;
//-- Verify the item against the manifest
@ -660,9 +652,9 @@ nsJAR::ParseOneFile(const char* filebuf, int16_t aFileType)
curItemMF->mType = JAR_INVALID;
}
//-- Check for duplicates
nsCStringKey key(curItemName);
if (mManifestData.Exists(&key))
if (mManifestData.Contains(curItemName)) {
curItemMF->mType = JAR_INVALID;
}
}
}
@ -674,8 +666,7 @@ nsJAR::ParseOneFile(const char* filebuf, int16_t aFileType)
CalculateDigest(sectionStart, sectionLength,
curItemMF->calculatedSectionDigest);
//-- Save item in the hashtable
nsCStringKey itemKey(curItemName);
mManifestData.Put(&itemKey, (void*)curItemMF);
mManifestData.Put(curItemName, curItemMF);
}
if (nextLineStart == nullptr) // end-of-file
break;
@ -690,9 +681,7 @@ nsJAR::ParseOneFile(const char* filebuf, int16_t aFileType)
{
if (foundName)
{
nsJARManifestItem* curItemSF;
nsCStringKey key(curItemName);
curItemSF = (nsJARManifestItem*)mManifestData.Get(&key);
nsJARManifestItem* curItemSF = mManifestData.Get(curItemName);
if(curItemSF)
{
NS_ASSERTION(curItemSF->status == JAR_NOT_SIGNED,

6
modules/libjar/nsJAR.h
View File

@ -16,11 +16,11 @@
#include "mozilla/Mutex.h"
#include "nsIComponentManager.h"
#include "nsCOMPtr.h"
#include "nsClassHashtable.h"
#include "nsString.h"
#include "nsIFile.h"
#include "nsStringEnumerator.h"
#include "nsHashKeys.h"
#include "nsHashtable.h"
#include "nsRefPtrHashtable.h"
#include "nsTHashtable.h"
#include "nsIZipReader.h"
@ -95,11 +95,13 @@ class nsJAR : public nsIZipReader
}
protected:
typedef nsClassHashtable<nsCStringHashKey, nsJARManifestItem> ManifestDataHashtable;
//-- Private data members
nsCOMPtr<nsIFile> mZipFile; // The zip/jar file on disk
nsCString mOuterZipEntry; // The entry in the zip this zip is reading from
nsRefPtr<nsZipArchive> mZip; // The underlying zip archive
nsObjectHashtable mManifestData; // Stores metadata for each entry
ManifestDataHashtable mManifestData; // Stores metadata for each entry
bool mParsedManifest; // True if manifest has been parsed
nsCOMPtr<nsICertificatePrincipal> mPrincipal; // The entity which signed this file
int16_t mGlobalStatus; // Global signature verification status