Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug 11570.

Browse Source
This commit is contained in:
cata%netscape.com 1999-09-01 00:46:04 +00:00
parent d651af4ec5
commit 4dd1b01674
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intl/uconv/src/nsCharsetConverterManager.cpp
View File

@ -214,7 +214,6 @@ nsresult nsCharsetConverterManager::CreateMapping()
nsIRegistry * registry = NULL;
nsIEnumerator * components = NULL;
nsIRegistry::Key uconvKey, key;
char buff[1024];
// XXX hack; make these dynamic
mEncArray = new ConverterInfo [100];
@ -544,21 +543,11 @@ NS_IMETHODIMP nsManagerFactory::CreateInstance(nsISupports *aDelegate,
if (aResult == NULL) return NS_ERROR_NULL_POINTER;
if (aDelegate != NULL) return NS_ERROR_NO_AGGREGATION;
nsresult res = NS_OK;
nsICharsetConverterManager * t = nsCharsetConverterManager::GetInstance();
if (t == NULL) return NS_ERROR_OUT_OF_MEMORY;
if (aIID.Equals(nsCOMTypeInfo<nsICharsetConverterManager>::GetIID()))
{
nsICharsetConverterManager * t = nsCharsetConverterManager::GetInstance();
if (t == NULL) return NS_ERROR_OUT_OF_MEMORY;
res = t->QueryInterface(aIID, aResult);
if (NS_FAILED(res)) delete t;
} else if(aIID.Equals(kIUnicodeDecodeUtilIID)) {
nsIUnicodeDecodeUtil * t = new nsUnicodeDecodeUtil();
if (t == NULL) return NS_ERROR_OUT_OF_MEMORY;
res = t->QueryInterface(aIID, aResult);
if (NS_FAILED(res)) delete t;
}
nsresult res = t->QueryInterface(aIID, aResult);
if (NS_FAILED(res)) delete t;
return res;
}