Compact input buffer before trying to read instead of after.

Also log an error when the input buffer contains more than MAXBUFSIZE bytes
already, instead of silently claiming the other side closed the connection.

diff --git a/src/meta.c b/src/meta.c
index ac937750b5933b90db4230a542a36cd477d9ab3d..cf6b9d446d82067ee3739afdbecd25bce1247313 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -85,6 +85,13 @@ bool receive_meta(connection_t *c) {
           - If not, keep stuff in buffer and exit.
         */
 
+       buffer_compact(&c->inbuf);
+
+       if(sizeof inbuf <= c->inbuf.len) {
+               logger(LOG_ERR, "Input buffer full for %s (%s)\n");
+               return false;
+       }
+
        inlen = recv(c->socket, inbuf, sizeof inbuf - c->inbuf.len, 0);
 
        if(inlen <= 0) {
@@ -151,7 +158,5 @@ bool receive_meta(connection_t *c) {
                }
        } while(inlen);
 
-       buffer_compact(&c->inbuf);
-
        return true;
 }