oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

client: added assertions on channel!=NULL

Browse Source 
I'm hunting down a bug where client->channel==NULL during I/O
operations.  These new assertions help avoid this kind of bug in the
future.
This commit is contained in:
Max Kellermann 2009-06-04 08:42:02 +02:00
parent ed475718e6
commit 427dd81678
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/client.c
View File

@ -430,6 +430,9 @@ static int client_read(struct client *client)
GIOStatus status; GIOStatus status;
gsize bytes_read; gsize bytes_read;
assert(client != NULL);
assert(client->channel != NULL);
p = fifo_buffer_write(client->input, &max_length); p = fifo_buffer_write(client->input, &max_length);
if (p == NULL) { if (p == NULL) {
g_warning("[%u] buffer overflow", client->num); g_warning("[%u] buffer overflow", client->num);
@ -617,6 +620,10 @@ client_write_deferred_buffer(struct client *client,
GIOStatus status; GIOStatus status;
gsize bytes_written; gsize bytes_written;
assert(client != NULL);
assert(client->channel != NULL);
assert(buffer != NULL);
status = g_io_channel_write_chars status = g_io_channel_write_chars
(client->channel, buffer->data, buffer->size, (client->channel, buffer->data, buffer->size,
&bytes_written, &error); &bytes_written, &error);
@ -723,6 +730,9 @@ static void client_write_direct(struct client *client,
GIOStatus status; GIOStatus status;
gsize bytes_written; gsize bytes_written;
assert(client != NULL);
assert(client->channel != NULL);
assert(data != NULL);
assert(length > 0); assert(length > 0);
assert(g_queue_is_empty(client->deferred_send)); assert(g_queue_is_empty(client->deferred_send));