Bug 50844. Fixed mismatched memory free.
git-svn-id: svn://10.0.0.236/trunk@78487 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
5cb02e21e0
commit
7122cc624e
@ -667,11 +667,8 @@ nsJARChannel::GetContentType(char* *aContentType)
|
||||
nsresult rv = NS_OK;
|
||||
if (mContentType == nsnull) {
|
||||
if (!mJAREntry)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
char* fileName = new char[PL_strlen(mJAREntry)+1];
|
||||
PL_strcpy(fileName, mJAREntry);
|
||||
|
||||
return NS_ERROR_FAILURE;
|
||||
char* fileName = nsCRT::strdup(mJAREntry);
|
||||
if (fileName != nsnull) {
|
||||
PRInt32 len = nsCRT::strlen(fileName);
|
||||
const char* ext = nsnull;
|
||||
@ -689,7 +686,7 @@ nsJARChannel::GetContentType(char* *aContentType)
|
||||
}
|
||||
}
|
||||
else
|
||||
rv = NS_ERROR_FAILURE;
|
||||
rv = NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
delete []fileName;
|
||||
}
|
||||
|
||||
@ -667,11 +667,8 @@ nsJARChannel::GetContentType(char* *aContentType)
|
||||
nsresult rv = NS_OK;
|
||||
if (mContentType == nsnull) {
|
||||
if (!mJAREntry)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
char* fileName = new char[PL_strlen(mJAREntry)+1];
|
||||
PL_strcpy(fileName, mJAREntry);
|
||||
|
||||
return NS_ERROR_FAILURE;
|
||||
char* fileName = nsCRT::strdup(mJAREntry);
|
||||
if (fileName != nsnull) {
|
||||
PRInt32 len = nsCRT::strlen(fileName);
|
||||
const char* ext = nsnull;
|
||||
@ -689,7 +686,7 @@ nsJARChannel::GetContentType(char* *aContentType)
|
||||
}
|
||||
}
|
||||
else
|
||||
rv = NS_ERROR_FAILURE;
|
||||
rv = NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
delete []fileName;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user