From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 1 Sep 2017 12:25:37 +0000 (-0400)
Subject: Include trailing \0 in "used" count.  Part of #2051
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04119db0da0438d100d3af99087912f571fbb354;p=thirdparty%2Ffreeradius-server.git

Include trailing \0 in "used" count.  Part of #2051
---

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 3a29e276ae6..d0fa9758006 100644
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -1513,7 +1513,7 @@ static size_t rest_response_body(void *ptr, size_t size, size_t nmemb, void *use
 		return t;
 
 	default:
-		if (t > (ctx->alloc - ctx->used)) {
+		if ((t + 1) > (ctx->alloc - ctx->used) {
 			ctx->alloc += ((t + 1) > REST_BODY_INIT) ? t + 1 : REST_BODY_INIT;
 
 			tmp = ctx->buffer;
@@ -1525,7 +1525,7 @@ static size_t rest_response_body(void *ptr, size_t size, size_t nmemb, void *use
 			}
 		}
 		strlcpy(ctx->buffer + ctx->used, p, t + 1);
-		ctx->used += t;
+		ctx->used += t;	/* don't include the trailing zero */
 
 		break;
 	}