Skip to content
Snippets Groups Projects
Commit d393b0a1 authored by Bin Meng's avatar Bin Meng Committed by Paolo Bonzini
Browse files

util/main-loop: Avoid adding the same HANDLE twice


Fix the logic in qemu_add_wait_object() to avoid adding the same
HANDLE twice, as the behavior is undefined when passing an array
that contains same HANDLEs to WaitForMultipleObjects() API.

Signed-off-by: default avatarBin Meng <bin.meng@windriver.com>
Message-Id: <20221019102015.2441622-2-bmeng.cn@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4f76b3d9
No related branches found
No related tags found
No related merge requests found
......@@ -157,6 +157,8 @@ typedef void WaitObjectFunc(void *opaque);
* in the main loop's calls to WaitForMultipleObjects. When the handle
* is in a signaled state, QEMU will call @func.
*
* If the same HANDLE is added twice, this function returns -1.
*
* @handle: The Windows handle to be observed.
* @func: A function to be called when @handle is in a signaled state.
* @opaque: A pointer-size value that is passed to @func.
......
......@@ -373,10 +373,20 @@ static WaitObjects wait_objects = {0};
int qemu_add_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque)
{
int i;
WaitObjects *w = &wait_objects;
if (w->num >= MAXIMUM_WAIT_OBJECTS) {
return -1;
}
for (i = 0; i < w->num; i++) {
/* check if the same handle is added twice */
if (w->events[i] == handle) {
return -1;
}
}
w->events[w->num] = handle;
w->func[w->num] = func;
w->opaque[w->num] = opaque;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment