From 4a0925f33deaacb48ad57fa4800dbf31fdbc5248 Mon Sep 17 00:00:00 2001 From: counterpoint Date: Sat, 18 Jul 2015 16:21:29 +0100 Subject: [PATCH] Correct mistake in dcb_read; use larger integer to accomodate three byte length in modutil. --- server/core/dcb.c | 2 +- server/core/modutil.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/core/dcb.c b/server/core/dcb.c index 46e0b1555..9cf3c77df 100644 --- a/server/core/dcb.c +++ b/server/core/dcb.c @@ -831,7 +831,7 @@ int dcb_read( dcb->last_read = hkheartbeat; bufsize = MIN(bytesavailable, MAX_BUFFER_SIZE); - if (maxbytes) bufsize = MIN(bufsize, maxbytes); + if (maxbytes) bufsize = MIN(bufsize, maxbytes-nreadtotal); if ((buffer = gwbuf_alloc(bufsize)) == NULL) { diff --git a/server/core/modutil.c b/server/core/modutil.c index 6fa7b3c8b..860f93cc9 100644 --- a/server/core/modutil.c +++ b/server/core/modutil.c @@ -540,7 +540,7 @@ GWBUF* modutil_get_complete_packets(GWBUF** p_readbuf) { GWBUF *buff = NULL, *packet; uint8_t *ptr; - int len,blen,total = 0; + uint32_t len,blen,total = 0; if(p_readbuf == NULL || (*p_readbuf) == NULL || gwbuf_length(*p_readbuf) < 3)