X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fbuffer.c;h=ac57d1c459e1e97790285425fb38b436cea27a28;hp=249e3e0f1c9634e08efccdce2a4e28178cf15a45;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=8de8f1d9e2c2c02d4a14a5506e7d0d914dc328da

diff --git a/src/buffer.c b/src/buffer.c
index 249e3e0f..ac57d1c4 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,7 +57,7 @@ char *buffer_prepare(buffer_t *buffer, int size) {
 }
 
 // Copy data into the buffer.
-			
+
 void buffer_add(buffer_t *buffer, const char *data, int size) {
 	memcpy(buffer_prepare(buffer, size), data, size);
 }
@@ -101,7 +101,7 @@ char *buffer_read(buffer_t *buffer, int 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;