]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Include trailing \0 in "used" count. Part of #2051
authorAlan T. DeKok <aland@freeradius.org>
Fri, 1 Sep 2017 12:25:37 +0000 (08:25 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Fri, 1 Sep 2017 12:32:42 +0000 (08:32 -0400)
src/modules/rlm_rest/rest.c

index 3a29e276ae6eb392feb8021df014cf7d9fefd3bb..d0fa9758006d8635c6cceafd3a8445d6a67fd19b 100644 (file)
@@ -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;
        }