X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fbuffer.c;h=c6c3495411f08fcb7c0df4f6a198cf3c8ca811fa;hp=72888b508e405d5d4774844e2b3663ec0f2f76f3;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=ffa3a443b9f01d3ea0fcb3c4fc6928a5c695cf4a

diff --git a/src/buffer.c b/src/buffer.c
index 72888b50..c6c34954 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,6 +1,6 @@
 /*
     buffer.c -- buffer management
-    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@
 #include "buffer.h"
 #include "xalloc.h"
 
-void buffer_compact(buffer_t *buffer) {
-	if(buffer->offset / 7 > buffer->len / 8) {
+void buffer_compact(buffer_t *buffer, size_t maxsize) {
+	if(buffer->len >= maxsize || buffer->offset / 7 > buffer->len / 8) {
 		memmove(buffer->data, buffer->data + buffer->offset, buffer->len - buffer->offset);
 		buffer->len -= buffer->offset;
 		buffer->offset = 0;
@@ -32,8 +32,10 @@ void buffer_compact(buffer_t *buffer) {
 
 // Make sure we can add size bytes to the buffer, and return a pointer to the start of those bytes.
 
-char *buffer_prepare(buffer_t *buffer, int size) {
+char *buffer_prepare(buffer_t *buffer, size_t size) {
 	if(!buffer->data) {
+		assert(!buffer->maxlen);
+
 		buffer->maxlen = size;
 		buffer->data = xmalloc(size);
 	} else {
@@ -57,14 +59,20 @@ char *buffer_prepare(buffer_t *buffer, int size) {
 }
 
 // Copy data into the buffer.
-			
-char *buffer_add(buffer_t *buffer, const char *data, int size) {
+
+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, int size) {
+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,26 +90,32 @@ static char *buffer_consume(buffer_t *buffer, int 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;
+	}
 
-	int len = newline + 1 - (buffer->data + buffer->offset);
+	size_t len = newline + 1 - (buffer->data + buffer->offset);
 	*newline = 0;
 	return buffer_consume(buffer, len);
 }
 
 // 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, int size) {
-	if(buffer->len - buffer->offset < size)
+char *buffer_read(buffer_t *buffer, size_t 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 = 0;
+	buffer->data = NULL;
 	buffer->maxlen = 0;
 	buffer->len = 0;
 	buffer->offset = 0;