X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_encoding.c;h=bc3a1bdc6f4036353b8516b956aa4cc75e57b672;hp=ce47fcdff87cf30a5a15dd7482a679ba61519ae6;hb=517336efe27e1f8e58e36352478a6d9ffdcdf378;hpb=a3ac311bb52e1947e743739c9d165b7aa01583b8

diff --git a/php_http_encoding.c b/php_http_encoding.c
index ce47fcd..bc3a1bd 100644
--- a/php_http_encoding.c
+++ b/php_http_encoding.c
@@ -129,9 +129,7 @@ static inline int php_http_inflate_rounds(z_stream *Z, int flush, char **buf, si
 			fprintf(stderr, "\n%3d: %3d PRIOR: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out);
 #endif
 			status = inflate(Z, flush);
-			
-			buffer.used += buffer.free - Z->avail_out;
-			buffer.free = Z->avail_out;
+			php_http_buffer_account(&buffer, buffer.free - Z->avail_out);
 #if 0
 			fprintf(stderr, "%3d: %3d AFTER: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out);
 #endif
@@ -203,7 +201,7 @@ retry_raw_inflate:
 	status = inflateInit2(&Z, wbits);
 	if (Z_OK == status) {
 		Z.next_in = (Bytef *) data;
-		Z.avail_in = data_len;
+		Z.avail_in = data_len + 1; /* include the terminating NULL, see #61287 */
 		
 		switch (status = php_http_inflate_rounds(&Z, Z_NO_FLUSH, decoded, decoded_len)) {
 			case Z_STREAM_END: