Fix bug #71629: sync php_url_decode definition

This commit is contained in:
Stanislav Malyshev 2016-02-21 17:02:55 -08:00
parent 0bd64b50b8
commit d25e67eee6
2 changed files with 4 additions and 2 deletions

2
NEWS
View file

@ -3,6 +3,8 @@ PHP NEWS
?? ??? 2016 PHP 7.0.5
- Core:
. Fixed bug #71629 (Out-of-bounds access in php_url_decode in context
php_stream_url_wrap_rfc2397). (mt at debian dot org)
. Fixed bug #71622 (Strings used in pass-as-reference cannot be used to
invoke C::$callable()). (Bob)
. Fixed bug #71596 (Segmentation fault on ZTS with date function

View file

@ -22,7 +22,7 @@
#include "php.h"
#include "ext/standard/base64.h"
PHPAPI int php_url_decode(char *str, int len);
PHPAPI size_t php_url_decode(char *str, size_t len);
/* Memory streams use a dynamic memory buffer to emulate a stream.
* You can use php_stream_memory_open to create a readonly stream
@ -730,7 +730,7 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, con
ilen = (int)ZSTR_LEN(base64_comma);
} else {
comma = estrndup(comma, dlen);
dlen = php_url_decode(comma, (int)dlen);
dlen = php_url_decode(comma, dlen);
ilen = (int)dlen;
}