Merge branch 'v2.6.x'

[m6w6/ext-http] / src / php_http_encoding.c

diff --git a/src/php_http_encoding.c b/src/php_http_encoding.c
index 7fbe7c7a51d49859cbcce173de3bea6083963f91..db364b3858e3273d339696bf89c5fe16ea317388 100644 (file)
--- 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;
                }
 
@@ -222,7 +223,7 @@ retry_raw_inflate:
                }
                inflateEnd(&Z);
 
-               if (decoded_len && *decoded) {
+               if (*decoded_len && *decoded) {
                        efree(*decoded);
                }
        }