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

client: added assertions on the buffer pointers

Browse Source 
The buffer pointers must not exceed the buffer size.
This commit is contained in:
Max Kellermann
2008-10-17 23:29:41 +02:00
parent d691577a96
commit 3689d5e4ed
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client.c
View File

@@ -449,6 +449,9 @@ static int client_input_received(struct client *client, size_t bytesRead)
char *newline, *next; char *newline, *next;
int ret; int ret;
assert(client->bufferPos <= client->bufferLength);
assert(client->bufferLength + bytesRead <= sizeof(client->buffer));
client->bufferLength += bytesRead; client->bufferLength += bytesRead;
end = client->buffer + client->bufferLength; end = client->buffer + client->bufferLength;
@@ -501,6 +504,9 @@ static int client_read(struct client *client)
{ {
ssize_t bytesRead; ssize_t bytesRead;
assert(client->bufferPos <= client->bufferLength);
assert(client->bufferLength < sizeof(client->buffer));
bytesRead = read(client->fd, bytesRead = read(client->fd,
client->buffer + client->bufferLength, client->buffer + client->bufferLength,
CLIENT_MAX_BUFFER_LENGTH - client->bufferLength); CLIENT_MAX_BUFFER_LENGTH - client->bufferLength);