X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fbuffer.c;h=c6c3495411f08fcb7c0df4f6a198cf3c8ca811fa;hb=2224a56ea44bffdafbe29ba7b74d1a0adb0cbd95;hp=ccef7279bc15e2722de77a4bbaf3a4ec879e2309;hpb=f79cc0e0bba16a3aa42a5fa13098cda714623205;p=meshlink

diff --git a/src/buffer.c b/src/buffer.c
index ccef7279..c6c34954 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -34,6 +34,8 @@ void buffer_compact(buffer_t *buffer, size_t maxsize) {
 
 char *buffer_prepare(buffer_t *buffer, size_t size) {
 	if(!buffer->data) {
+		assert(!buffer->maxlen);
+
 		buffer->maxlen = size;
 		buffer->data = xmalloc(size);
 	} else {
@@ -59,12 +61,18 @@ char *buffer_prepare(buffer_t *buffer, size_t size) {
 // Copy data into the buffer.
 
 void buffer_add(buffer_t *buffer, const char *data, size_t size) {
+	assert(data);
+	assert(size);
+
 	memcpy(buffer_prepare(buffer, size), data, size);
 }
 
 // Remove given number of bytes from the buffer, return a pointer to the start of them.
 
 static char *buffer_consume(buffer_t *buffer, size_t size) {
+	assert(size);
+	assert(buffer->len - buffer->offset >= size);
+
 	char *start = buffer->data + buffer->offset;
 
 	buffer->offset += size;
@@ -82,8 +90,9 @@ static char *buffer_consume(buffer_t *buffer, size_t size) {
 char *buffer_readline(buffer_t *buffer) {
 	char *newline = memchr(buffer->data + buffer->offset, '\n', buffer->len - buffer->offset);
 
-	if(!newline)
+	if(!newline) {
 		return NULL;
+	}
 
 	size_t len = newline + 1 - (buffer->data + buffer->offset);
 	*newline = 0;
@@ -93,13 +102,18 @@ char *buffer_readline(buffer_t *buffer) {
 // Check if we have enough bytes in the buffer, and if so, return a pointer to the start of them.
 
 char *buffer_read(buffer_t *buffer, size_t size) {
-	if(buffer->len - buffer->offset < size)
+	assert(size);
+
+	if(buffer->len - buffer->offset < size) {
 		return NULL;
+	}
 
 	return buffer_consume(buffer, size);
 }
 
 void buffer_clear(buffer_t *buffer) {
+	assert(!buffer->data == !buffer->maxlen);
+
 	free(buffer->data);
 	buffer->data = NULL;
 	buffer->maxlen = 0;