From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 23 Oct 2020 06:23:03 +0000 (+0000)
Subject: * apr_base64_encode_len already includes space for the terminating zero
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=737cb302c4fecf1c01ae31dbe3cfe98fb0ece9ff;p=thirdparty%2Fapache%2Fhttpd.git

* apr_base64_encode_len already includes space for the terminating zero
  and apr_base64_encode returns a zero terminated string in encoded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1882775 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/util.c b/server/util.c
index 24480019c14..f829b5668eb 100644
--- a/server/util.c
+++ b/server/util.c
@@ -2558,9 +2558,8 @@ AP_DECLARE(char *) ap_pbase64encode(apr_pool_t *p, char *string)
     char *encoded;
     int l = strlen(string);
 
-    encoded = (char *) apr_palloc(p, 1 + apr_base64_encode_len(l));
-    l = apr_base64_encode(encoded, string, l);
-    encoded[l] = '\0'; /* make binary sequence into string */
+    encoded = (char *) apr_palloc(p, apr_base64_encode_len(l));
+    apr_base64_encode(encoded, string, l);
 
     return encoded;
 }