httpd_output: check client->write_source_id in handler

Due to a race condition, httpd_client_out_event() could be called even when its GLib event source was already removed. Check that case.

httpd_output: check client->write_source_id in handler
87070651 · Max Kellermann · 58844aab · 87070651
Commit 87070651 authored Mar 15, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

httpd_client.c src/output/httpd_client.c +7 -0

No files found.
--- a/src/output/httpd_client.c
+++ b/src/output/httpd_client.c
@@ -459,6 +459,13 @@ httpd_client_out_event(GIOChannel *source,
 	assert(condition == G_IO_OUT);
 	assert(client->state == RESPONSE);

+	if (client->write_source_id == 0) {
+		/* another thread has removed the event source while
+		   this thread was waiting for httpd->mutex */
+		g_mutex_unlock(httpd->mutex);
+		return false;
+	}
+
 	if (client->current_page == NULL) {
 		client->current_page = g_queue_pop_head(client->pages);
 		client->current_position = 0;