Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 249e3e0..3d4c329 100644 (file)
--- 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;
@@ -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;