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

* GetModeList() didn't correctly check if the mode list allocation failed.

Browse Source 
* No longer changes the arguments in case of an error.
* Takes communication errors more gracefully.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16703 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-03-11 15:15:25 +00:00
parent f157272bee
commit 067407432e
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/PrivateScreen.cpp
+14 -5
View File
@@ -425,14 +425,23 @@ BPrivateScreen::GetModeList(display_mode **_modeList, uint32 *_count)
status_t status = B_ERROR;
if (link.FlushWithReply(status) == B_OK && status == B_OK) {
link.Read<uint32>(_count);
uint32 count;
if (link.Read<uint32>(&count) < B_OK)
return B_ERROR;
// TODO: this could get too big for the link
int32 size = *_count * sizeof(display_mode);
*_modeList = (display_mode *)malloc(size);
if (_modeList == NULL)
int32 size = count * sizeof(display_mode);
display_mode* modeList = (display_mode *)malloc(size);
if (modeList == NULL)
return B_NO_MEMORY;
link.Read(*_modeList, size);
if (link.Read(modeList, size) < B_OK) {
free(modeList);
return B_ERROR;
}
*_modeList = modeList;
*_count = count;
}
return status;