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

Fix #10302.

Browse Source 
- In the case of an error while unflattening, BMediaRoster::GetParameterWebFor()
would allocate a new parameter web object into the passed in web pointer, and
then delete it again. This would result in the desklink MixerControl object having
a bogus pointer in its fParameterWeb member, leading to a crash. As such, create
the object in a local variable first, and only overwrite the passed in pointer on
success. Furthermore, explicitly reset said pointer to NULL in desklink on failure,
as _Disconnect() tries to delete it unconditionally.
This commit is contained in:
Rene Gollent
2013-12-13 17:27:48 -05:00
parent de1fb0e450
commit df612ac9b3
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/desklink/MixerControl.cpp
+1
View File
@@ -158,6 +158,7 @@ retry:
} }
} else { } else {
errorString = "No parameter web"; errorString = "No parameter web";
fParameterWeb = NULL;
} }
} else { } else {
if (!retrying) { if (!retrying) {
src/kits/media/MediaRoster.cpp
+10 -8
View File
@@ -2262,8 +2262,8 @@ BMediaRoster::GetParameterWebFor(const media_node& node, BParameterWeb** _web)
} }
if (reply.size > 0) { if (reply.size > 0) {
// we got a flattened parameter web! // we got a flattened parameter web!
*_web = new (std::nothrow) BParameterWeb(); BParameterWeb* web = new (std::nothrow) BParameterWeb();
if (*_web == NULL) if (web == NULL)
rv = B_NO_MEMORY; rv = B_NO_MEMORY;
else { else {
printf("BMediaRoster::GetParameterWebFor Unflattening %" printf("BMediaRoster::GetParameterWebFor Unflattening %"
@@ -2272,13 +2272,15 @@ BMediaRoster::GetParameterWebFor(const media_node& node, BParameterWeb** _web)
((uint32*)data)[0], ((uint32*)data)[1], ((uint32*)data)[2], ((uint32*)data)[0], ((uint32*)data)[1], ((uint32*)data)[2],
((uint32*)data)[3]); ((uint32*)data)[3]);
rv = (*_web)->Unflatten(reply.code, data, reply.size); rv = web->Unflatten(reply.code, data, reply.size);
} if (rv != B_OK) {
if (rv != B_OK) { ERROR("BMediaRoster::GetParameterWebFor Unflatten failed, "
ERROR("BMediaRoster::GetParameterWebFor Unflatten failed, " "%s\n", strerror(rv));
"%s\n", strerror(rv)); delete web;
delete *_web; } else
*_web = web;
} }
delete_area(area); delete_area(area);
return rv; return rv;
} }