X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fbuffer.c;h=a9e79aa95a1ac39a54b0dc6fcc8cb9f4399692a4;hb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;hp=72888b508e405d5d4774844e2b3663ec0f2f76f3;hpb=ffa3a443b9f01d3ea0fcb3c4fc6928a5c695cf4a;p=tinc

diff --git a/src/buffer.c b/src/buffer.c
index 72888b50..a9e79aa9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -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, int 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;
@@ -57,8 +57,8 @@ 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, int size) {
 	memcpy(buffer_prepare(buffer, size), data, size);
 }
 
@@ -82,8 +82,9 @@ 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);
 	*newline = 0;
@@ -93,15 +94,16 @@ 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, int size) {
-	if(buffer->len - buffer->offset < size)
+	if(buffer->len - buffer->offset < size) {
 		return NULL;
+	}
 
 	return buffer_consume(buffer, size);
 }
 
 void buffer_clear(buffer_t *buffer) {
 	free(buffer->data);
-	buffer->data = 0;
+	buffer->data = NULL;
 	buffer->maxlen = 0;
 	buffer->len = 0;
 	buffer->offset = 0;