Check if an event is initialized before calling event_del().

[tinc] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 72888b508e405d5d4774844e2b3663ec0f2f76f3..315faf18e66f9dbec8e19ee4606b3d67ed984686 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;
@@ -58,7 +58,7 @@ 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);
 }