From: Michael Wallner <mike@php.net>
Date: Sat, 10 Mar 2012 08:22:22 +0000 (+0000)
Subject: add php_http_buffer_account(buf, size_t account)
X-Git-Tag: DEV_2-before-client~24
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=9de008496a220c769a745cd1eead0a3b3d7d6cca

add php_http_buffer_account(buf, size_t account)
---

diff --git a/php_http_buffer.c b/php_http_buffer.c
index bd99dc8..ef0abcd 100644
--- a/php_http_buffer.c
+++ b/php_http_buffer.c
@@ -72,6 +72,19 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex(php_http_buffer_t *buf, siz
 	return 0;
 }
 
+PHP_HTTP_BUFFER_API char *php_http_buffer_account(php_http_buffer_t *buf, size_t to_account)
+{
+	/* it's probably already too late but check anyway */
+	if (to_account > buf->free) {
+		return NULL;
+	}
+
+	buf->free -= to_account;
+	buf->used += to_account;
+
+	return buf->data + buf->used;
+}
+
 PHP_HTTP_BUFFER_API size_t php_http_buffer_shrink(php_http_buffer_t *buf)
 {
 	/* avoid another realloc on fixation */
diff --git a/php_http_buffer.h b/php_http_buffer.h
index 2052fe8..012c8cf 100644
--- a/php_http_buffer.h
+++ b/php_http_buffer.h
@@ -151,6 +151,8 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_from_string_ex(php_http_b
 #define php_http_buffer_resize(b, s) php_http_buffer_resize_ex((b), (s), 0, 0)
 PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex(php_http_buffer_t *buf, size_t len, size_t override_size, int allow_error);
 
+PHP_HTTP_BUFFER_API char *php_http_buffer_account(php_http_buffer_t *buf, size_t to_account);
+
 /* shrink memory chunk to actually used size (+1) */
 PHP_HTTP_BUFFER_API size_t php_http_buffer_shrink(php_http_buffer_t *buf);
 
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:
diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index 23cf4f8..ca2027b 100644
--- a/php_http_message_parser.c
+++ b/php_http_message_parser.c
@@ -117,38 +117,31 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse_strea
 			case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER:
 			case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE:
 				/* read line */
-				php_stream_get_line(s, buf.data, buf.free, &len);
-				buf.used += len;
-				buf.free -= len;
+				php_stream_get_line(s, buf.data + buf.used, buf.free, &len);
+				php_http_buffer_account(&buf, len);
 				break;
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB:
 				/* read all */
-				len = php_stream_read(s, buf.data, buf.free);
-				buf.used += len;
-				buf.free -= len;
+				php_http_buffer_account(&buf, php_stream_read(s, buf.data + buf.used, buf.free));
 				break;
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH:
 				/* read body_length */
-				len = php_stream_read(s, buf.data, MIN(buf.free, parser->body_length));
-				buf.used += len;
-				buf.free -= len;
+				php_http_buffer_account(&buf, php_stream_read(s, buf.data + buf.used, MIN(buf.free, parser->body_length)));
 				break;
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED:
 				/* duh, this is very naive */
 				if (len) {
-					size_t read = php_stream_read(s, buf.data, MIN(len, buf.free));
+					size_t read = php_stream_read(s, buf.data + buf.used, MIN(len, buf.free));
 
-					buf.used += read;
-					buf.free -= read;
+					php_http_buffer_account(&buf, read);
 
 					len -= read;
 				} else {
 					php_stream_get_line(s, buf.data, buf.free, &len);
-					buf.used += len;
-					buf.free -= len;
+					php_http_buffer_account(&buf, len);
 
 					len = strtoul(buf.data - len, NULL, 16);
 				}