X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=18b14e2cf1265803f1068167e21f9169f6dfb7ce;hp=fb43d99420907f8dce9a6b0b910067f04c4463f5;hb=a960f6fd6e637ffa03a87985a7df3bc9c98a360b;hpb=4c925ef964f909cc5492ac9b37d03d85de1f5cc6

diff --git a/http_api.c b/http_api.c
index fb43d99..18b14e2 100644
--- a/http_api.c
+++ b/http_api.c
@@ -30,6 +30,7 @@
 #include "php_http_send_api.h"
 
 #ifdef ZEND_ENGINE_2
+#	include "zend_exceptions.h"
 #	include "php_http_exception_object.h"
 #endif
 
@@ -70,7 +71,7 @@ void _http_error_ex(long type, long code, const char *format, ...)
 #ifdef ZEND_ENGINE_2
 		char *message;
 		vspprintf(&message, 0, format, args);
-		zend_throw_exception(http_exception_get_default(), message, code TSRMLS_CC);
+		zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
 #else
 		type = E_WARNING;
 #endif
@@ -144,21 +145,32 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 	e_ptr = encoded;
 
 	while (((e_ptr - encoded) - encoded_len) > 0) {
+		int no_crlf = 0;
 		char *n_ptr;
 		size_t chunk_len = 0;
-		
+
 		chunk_len = strtol(e_ptr, &n_ptr, 16);
-		
-		if (n_ptr == e_ptr) {
+
+		/* check if:
+		 * - we could not read in chunk size
+		 * - chunk size is not followed by HTTP_CRLF|NUL
+		 */
+		if ((n_ptr == e_ptr) || (*n_ptr && (no_crlf = strncmp(n_ptr, HTTP_CRLF, lenof(HTTP_CRLF))))) {
 			/* don't fail on apperently not encoded data */
 			if (e_ptr == encoded) {
 				memcpy(*decoded, encoded, encoded_len);
 				*decoded_len = encoded_len;
 				return encoded + encoded_len;
 			} else {
-				char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
-				http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
-				efree(error);
+				efree(*decoded);
+				if (no_crlf) {
+					http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
+				} else {
+					char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
+					http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
+					efree(error);
+				}
+
 				return NULL;
 			}
 		} else {
@@ -170,14 +182,6 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 			break;
 		}
 
-		/* new line */
-		if (strncmp(e_ptr, HTTP_CRLF, 2)) {
-			http_error_ex(E_WARNING, HTTP_E_PARSE,
-				"Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *e_ptr, *(e_ptr + 1));
-			efree(*decoded);
-			return NULL;
-		}
-
 		memcpy(d_ptr, e_ptr += 2, chunk_len);
 		d_ptr += chunk_len;
 		e_ptr += chunk_len + 2;