X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_encoding.c;h=83d17947790c106abfc8702f3ac975d8aa5b15ba;hb=e096f45ff30a46d6a8e96da7bc6334d2ac5ab7c2;hp=0aa7dc1638301b58bf66b46d4615e98e81ab6657;hpb=e7f3c1766222862532aadbfbafdb6017fef2747c;p=m6w6%2Fext-http

diff --git a/src/php_http_encoding.c b/src/php_http_encoding.c
index 0aa7dc1..83d1794 100644
--- a/src/php_http_encoding.c
+++ b/src/php_http_encoding.c
@@ -64,7 +64,7 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c
 		/* reached the end */
 		if (!chunk_len) {
 			/* move over '0' chunked encoding terminator and any new lines */
-			do {
+			while(1) {
 				switch (*e_ptr) {
 					case '0':
 					case '\r':
@@ -72,7 +72,8 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c
 						++e_ptr;
 						continue;
 				}
-			} while (0);
+				break;
+			}
 			break;
 		}
 
@@ -261,10 +262,9 @@ php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stre
 php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
 {
 	if (from->ops->copy) {
-		int freeme;
 		php_http_encoding_stream_t *ns;
 
-		if ((freeme = !to)) {
+		if (!to) {
 			to = pemalloc(sizeof(*to), (from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
 		}
 		memset(to, 0, sizeof(*to));
@@ -277,10 +277,6 @@ php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stre
 		} else {
 			return to;
 		}
-
-		if (freeme) {
-			pefree(to, (to->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
-		}
 	}
 
 	return NULL;