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

_user_wait_for_objects(): Don't copy the infos back to userland when an error

Browse Source 
occurred. This fixes the automatic syscall restart case (would wait forever)
and aligns the behavior with poll().


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35948 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-03-25 15:57:38 +00:00
parent 6e5c475a09
commit a959bc5b23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/system/kernel/wait_for_objects.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2007-2009, Ingo Weinhold, ingo_weinhold@gmx.de.
* Copyright 2007-2010, Ingo Weinhold, ingo_weinhold@gmx.de.
* Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License.
*/
@ -1071,7 +1071,7 @@ _user_wait_for_objects(object_wait_info* userInfos, int numInfos, uint32 flags,
result = common_wait_for_objects(infos, numInfos, flags, timeout,
false);
if (user_memcpy(userInfos, infos, bytes) != B_OK) {
if (result >= 0 && user_memcpy(userInfos, infos, bytes) != B_OK) {
if (result >= 0)
result = B_BAD_ADDRESS;
} else
@ -1083,4 +1083,3 @@ _user_wait_for_objects(object_wait_info* userInfos, int numInfos, uint32 flags,
return result;
}