Fixed bug #38236 (Binary data gets corrupted on multipart/formdata POST).

This commit is contained in:
Ilia Alshanetsky 2006-07-27 15:37:56 +00:00
parent 96324fb67f
commit 7ba86d078f
2 changed files with 18 additions and 10 deletions

2
NEWS
View File

@ -15,6 +15,8 @@ PHP NEWS
. Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2
compatibility issue). (Patch: scott dot moynes+php at gmail dot com)
- Fixed bug #38236 (Binary data gets corrupted on multipart/formdata POST).
(Ilia)
- Fixed bug #38234 (Exception in __clone makes memory leak). (Dmitry, Nuno)
- Fixed bug #38229 (strtotime() does not parse YYYY-MM format). (Ilia)
- Fixed bug #38224 (session extension can't handle broken cookies). (Ilia)

View File

@ -216,31 +216,37 @@ plain_var:
SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
{
char *var, *val;
char *strtok_buf = NULL;
char *var, *val, *e, *s, *p;
zval *array_ptr = (zval *) arg;
if (SG(request_info).post_data == NULL) {
return;
}
var = php_strtok_r(SG(request_info).post_data, "&", &strtok_buf);
s = SG(request_info).post_data;
e = s + SG(request_info).post_data_length;
while (var) {
val = strchr(var, '=');
if (val) { /* have a value */
while (s < e && (p = memchr(s, '&', (e - s)))) {
last_value:
if ((val = memchr(s, '=', (p - s)))) { /* have a value */
unsigned int val_len, new_val_len;
*val++ = '\0';
php_url_decode(var, strlen(var));
val_len = php_url_decode(val, strlen(val));
var = s;
php_url_decode(var, (val - s));
val++;
val_len = php_url_decode(val, (p - val));
val = estrndup(val, val_len);
if (sapi_module.input_filter(PARSE_POST, var, &val, val_len, &new_val_len TSRMLS_CC)) {
php_register_variable_safe(var, val, new_val_len, array_ptr TSRMLS_CC);
}
efree(val);
}
var = php_strtok_r(NULL, "&", &strtok_buf);
s = p + 1;
}
if (s < e) {
p = e;
goto last_value;
}
}