in_forward: increase the buffer size to buffer_max_size

If conn->buf_size is no space to add buffer_chunk_size, the size to realloc should be buffer_max_size. Signed-off-by: Takahiro Yamashita <[email protected]>
fluent · Dec 12, 2021 · 4e75acd · 4e75acd
1 parent a580e20
commit 4e75acd
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/plugins/in_forward/fw_conn.c b/plugins/in_forward/fw_conn.c
@@ -44,14 +44,20 @@ int fw_conn_event(void *data)
     if (event->mask & MK_EVENT_READ) {
         available = (conn->buf_size - conn->buf_len);
         if (available < 1) {
-            if (conn->buf_size + ctx->buffer_chunk_size > ctx->buffer_max_size) {
+            if (conn->buf_size >= ctx->buffer_max_size) {
                 flb_plg_warn(ctx->ins, "fd=%i incoming data exceed limit (%lu bytes)",
                              event->fd, (ctx->buffer_max_size));
                 fw_conn_del(conn);
                 return -1;
             }
-
-            size = conn->buf_size + ctx->buffer_chunk_size;
+            else if (conn->buf_size + ctx->buffer_chunk_size > ctx->buffer_max_size) {
+                /* no space to add buffer_chunk_size */
+                /* set maximum size */
+                size = ctx->buffer_max_size;
+            }
+            else {
+                size = conn->buf_size + ctx->buffer_chunk_size;
+            }
             tmp = flb_realloc(conn->buf, size);
             if (!tmp) {
                 flb_errno();