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

CID 1584 : NULL dereference on low memory situations (get_window_info does a malloc that may fail)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38134 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-08-16 09:31:38 +00:00
parent 3ea58911f9
commit e414da37a1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/screenshot/Screenshot.cpp
+4 -3
View File
@@ -300,17 +300,18 @@ Screenshot::_GetActiveWindowFrame()
foundActiveWindow = true; foundActiveWindow = true;
} else if (reply.FindBool("result", &foundActiveWindow) != B_OK) } else if (reply.FindBool("result", &foundActiveWindow) != B_OK)
foundActiveWindow = false; foundActiveWindow = false;
if (foundActiveWindow) { if (foundActiveWindow) {
// Get the client_window_info of the active window // Get the client_window_info of the active window
foundActiveWindow = false; foundActiveWindow = false;
for (int i = 0; i < tokenCount; i++) { for (int i = 0; i < tokenCount; i++) {
token = tokens[i]; token = tokens[i];
windowInfo = get_window_info(token); windowInfo = get_window_info(token);
if (!windowInfo->is_mini && !windowInfo->show_hide_level > 0) { if (windowInfo && !windowInfo->is_mini
&& !windowInfo->show_hide_level > 0) {
foundActiveWindow = true; foundActiveWindow = true;
break; break;
} }
free(windowInfo); free(windowInfo);
} }
if (foundActiveWindow) if (foundActiveWindow)