Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MessageBuilder: Fix potential leaks in PushObject().

Browse Source
This commit is contained in:
Stephan Aßmus 2014-08-24 18:18:12 +02:00
parent 8f16f634d7
commit edc46535ed
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kits/shared/MessageBuilder.cpp
View File

@ -6,6 +6,7 @@
#include <MessageBuilder.h>
#include <AutoDeleter.h>
#include <String.h>
@ -30,14 +31,23 @@ BMessageBuilder::BMessageBuilder(BMessage& message)
status_t
BMessageBuilder::PushObject(const char* name)
{
BMessage* newMessage = new BMessage;
BMessage* newMessage = new(std::nothrow) BMessage;
if (newMessage == NULL)
return B_NO_MEMORY;
ObjectDeleter<BMessage> messageDeleter(newMessage);
if (!fNameStack.AddItem(new BString(name)))
return B_ERROR;
BString* nameString = new(std::nothrow) BString(name);
if (nameString == NULL)
return B_NO_MEMORY;
ObjectDeleter<BString> stringDeleter(nameString);
if (!fNameStack.AddItem(nameString))
return B_NO_MEMORY;
if (!fStack.AddItem(fCurrentMessage))
return B_ERROR;
return B_NO_MEMORY;
messageDeleter.Detach();
stringDeleter.Detach();
fCurrentMessage = newMessage;
return B_OK;