From 931e30f91a9241ab8aa705c911c92ba8943f80fd Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 22 May 2011 13:15:05 +0200 Subject: [PATCH] Always compact the buffer if it has reached MAXBUFSIZE. --- src/buffer.c | 4 ++-- src/buffer.h | 2 +- src/meta.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 249e3e0f..315faf18 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; diff --git a/src/buffer.h b/src/buffer.h index 73c1f69e..a96c15aa 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -8,7 +8,7 @@ typedef struct buffer_t { int offset; } buffer_t; -extern void buffer_compact(buffer_t *buffer); +extern void buffer_compact(buffer_t *buffer, int maxsize); extern char *buffer_prepare(buffer_t *buffer, int size); extern void buffer_add(buffer_t *buffer, const char *data, int size); extern char *buffer_readline(buffer_t *buffer); diff --git a/src/meta.c b/src/meta.c index cf6b9d44..5735da7e 100644 --- a/src/meta.c +++ b/src/meta.c @@ -85,10 +85,10 @@ bool receive_meta(connection_t *c) { - If not, keep stuff in buffer and exit. */ - buffer_compact(&c->inbuf); + buffer_compact(&c->inbuf, MAXBUFSIZE); if(sizeof inbuf <= c->inbuf.len) { - logger(LOG_ERR, "Input buffer full for %s (%s)\n"); + logger(LOG_ERR, "Input buffer full for %s (%s)\n", c, c->hostname); return false; } -- 2.20.1