#include "php_http_send_api.h"
#ifdef ZEND_ENGINE_2
+# include "zend_exceptions.h"
# include "php_http_exception_object.h"
#endif
#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
e_ptr = encoded;
while (((e_ptr - encoded) - encoded_len) > 0) {
- char hex_len[9] = {0};
+ int no_crlf = 0;
+ char *n_ptr;
size_t chunk_len = 0;
- int i = 0;
- /* read in chunk size */
- while (isxdigit(*e_ptr)) {
- if (i == 9) {
- http_error_ex(E_WARNING, HTTP_E_PARSE, "Chunk size is too long: 0x%s...", hex_len);
- efree(*decoded);
- return NULL;
- }
- hex_len[i++] = *e_ptr++;
- }
-
- /* hex to long */
- {
- char *error = NULL;
- chunk_len = strtol(hex_len, &error, 16);
- if (error == hex_len) {
- http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size string: '%s'", hex_len);
+ chunk_len = strtol(e_ptr, &n_ptr, 16);
+
+ /* 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 {
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);
+ efree(decoded);
+ }
+
return NULL;
}
+ } else {
+ e_ptr = n_ptr;
}
/* reached the end */
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;