corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 484610 Fix mismatched allocators r=jst sr=peterv

Browse Source
This commit is contained in:
Neil Rashbrook
2010-02-20 15:25:21 +00:00
parent 314ff1c6fd
commit 796e2ffca4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
embedding/components/commandhandler/src/nsCommandGroup.cpp
View File

@@ -268,7 +268,7 @@ nsControllerCommandGroup::AddCommandToGroup(const char * aCommand, const char *a
mGroupsHash.Put(&groupKey, (void *)commandList);
}
// add the command to the list. Note that we're not checking for duplicates here
char* commandString = nsCRT::strdup(aCommand); // we store allocated PRUnichar* in the array
char* commandString = NS_strdup(aCommand); // we store allocated PRUnichar* in the array
if (!commandString) return NS_ERROR_OUT_OF_MEMORY;
PRBool appended = commandList->AppendElement(commandString) != nsnull;

4
embedding/components/commandhandler/src/nsCommandParams.cpp
View File

@@ -167,7 +167,7 @@ NS_IMETHODIMP nsCommandParams::GetCStringValue(const char * name, char **_retval
if (foundEntry && foundEntry->mEntryType == eStringType)
{
NS_ASSERTION(foundEntry->mData.mCString, "Null string");
*_retval= nsCRT::strdup((*foundEntry->mData.mCString).get());
*_retval = ToNewCString(*foundEntry->mData.mCString);
return NS_OK;
}
@@ -421,7 +421,7 @@ nsCommandParams::GetNext(char **_retval)
if (!thisEntry)
return NS_ERROR_FAILURE;
*_retval = nsCRT::strdup(thisEntry->mEntryName.get());
*_retval = ToNewCString(thisEntry->mEntryName);
mCurEntry++;
return NS_OK;
}