i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmedia: fixed minor leak in BDiscreteParameter::AddItem.

Browse Source 
* CID 992460
This commit is contained in:
Jérôme Duval
2013-11-24 12:41:28 +01:00
parent aeaf492157
commit cb00db5bf0
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/ParameterWeb.cpp
+14 -4
View File
@@ -2016,17 +2016,27 @@ BDiscreteParameter::AddItem(int32 value, const char* name)
{ {
CALLED(); CALLED();
int32* valueCopy = new int32(value); int32* valueCopy = new(std::nothrow) int32(value);
if (valueCopy == NULL)
return B_NO_MEMORY;
char* nameCopy = strndup(name, 255); char* nameCopy = strndup(name, 255);
if (name != NULL && nameCopy == NULL) { if (name != NULL && nameCopy == NULL) {
delete valueCopy; delete valueCopy;
return B_NO_MEMORY; return B_NO_MEMORY;
} }
if (!fValues->AddItem(valueCopy) || !fSelections->AddItem(nameCopy)) if (!fValues->AddItem(valueCopy))
return B_NO_MEMORY; goto err;
if (!fSelections->AddItem(nameCopy)) {
fValues->RemoveItem(valueCopy);
goto err;
}
return B_OK; return B_OK;
err:
free(nameCopy);
delete valueCopy;
return B_NO_MEMORY;
} }