| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
| |
This reverts commit 3e62aae1b456440328af4153524e22679b84f68a.
|
| | |
|
| | |
|
| |
|
|
| |
files).
|
| |
|
|
| |
For some reason the merge reverts changed the version :/
|
| |
|
|
|
|
|
|
| |
This reverts the following merge commits (-m 1):
405ebfcd182a39f0960ff7d7055d49053d3e0316
d372b33c9b941be9a795bf3705bd22dc5f6092c3
36fa17a5fae84ab332366a202f0a709279a2466a
|
| |\
| |
| |
| |
| | |
* PHP-5.3:
Revert JSON changes to PHP 5.3
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts the following commits:
974324676b2436f159f42d9241c569f813471684
4662151ea7d7b6920d115cf2a2d6e9d4232727a3
84fe2cc890e49f40bac7c3ba74b3cfc6dc4cef2f
This does not revert the JSON changes released in PHP 5.3.14.
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
* PHP-5.3:
remove duplicates, fix order
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
* PHP-5.3:
- Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL)
|
| | |
| |
| |
| | |
for successful XFAIL)
|
| | | |
|
| |\ \
| |/ |
|
| | | |
|
| |\ \
| |/ |
|
| | |\ |
|
| |\ \ \ |
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
* PHP-5.3:
Fix some lengths in crypt()
Conflicts:
ext/standard/crypt.c
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use salt_len_in instead of strlen(salt) or PHP_MAX_SALT_LEN, otherwise too
much memory will be allocated.
sha512 has a 86 character checksum, not 43. That probably was a copy&paste
from the sha256 code which indeed has 43.
The allocation also was using sizeof(char *), thus allocating 4 or 8 times
as much memory as necessary. The sizeof(char *) was removed in the 5.4
branch in b7a92c9 but forgotten on 5.3.
The memset 0 call was using PHP_MAX_SALT_LEN which can be smaller than the
output buffer and thus not zeroing out everything. Use the size of the
output buffer (needed) instead.
|
| | | | | |
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
* PHP-5.3:
Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixed a memory allocation bug in crypt() SHA256/512 that can
cause segmentation faults when passed in salts with a null byte
early.
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
* PHP-5.3:
Add json_last_error_msg() function
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
This replaces json_last_error(true) and is consistent with other custom
error handling functions.
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* PHP-5.3:
Fix #62432 ReflectionMethod random corrupt memory on high concurrent
Conflicts:
ext/date/php_date.c
ext/fileinfo/fileinfo.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/reflection/php_reflection.c
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/spl/spl_dllist.c
ext/spl/spl_fixedarray.c
ext/spl/spl_heap.c
ext/spl/spl_iterators.c
ext/spl/spl_observer.c
ext/sqlite/sqlite.c
ext/sqlite3/sqlite3.c
ext/tidy/tidy.c
ext/xmlreader/php_xmlreader.c
ext/xmlwriter/php_xmlwriter.c
ext/xsl/php_xsl.c
ext/zip/php_zip.c
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
|
| |\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| | |/ |
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
* PHP-5.3:
Improve JSON error handling
Conflicts:
ext/json/tests/bug54058.phpt
ext/json/tests/bug61537.phpt
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
json_encode() no longer throws warnings. Instead only the error code for
json_last_error() is set.
As it is hard to debug the error from just an error code an optional
$as_string parameter was added to json_last_error(), which returns an
error message instead of an error code.
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
* PHP-5.3:
Fix memleak in CLI
Conflicts:
sapi/cli/php_cli.c
|
| | | |
|
| | | |
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* PHP-5.3:
ws fix
BFN
Fix bug #62373 (serialize() generates wrong reference to the object)
Conflicts:
php.ini-development
php.ini-production
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
function __memcmp).
Any C library function may be a macro, We should avoid using ZEND_STRS(L) as their arguments
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
* PHP-5.3:
Fix memory allocation checks for base64 encode
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
base64_encode used safe_emalloc, but one of the arguments was derived from a
multiplication, thus making the allocation unsafe again.
There was a size check in place, but it was off by a factor of two as it
didn't account for the signedness of the integer type.
The unsafe allocation is not exploitable, but still causes funny behavior
when the sized overflows into a negative number.
To fix the issue the *4 factor is moved into the size argument (where it is
known to be safe), so safe_emalloc can carry out the multiplication.
The size check is removed as it doesn't really make sense once safe_emalloc
works correctly. (Would only cause base64_encode to silently return false
instead of throwing an error. Also could cause problems with other uses of
the base64 encoding API, which all don't check for a NULL return value.)
Furthermore the (length + 2) < 0 check is replaced with just length < 0.
Allowing lengths -2 and -1 doesn't make sense semantically and also is not
honored in the following code (negative length would access unallocated
memory.)
Actually the length < 0 check doesn't make sense altogether, but I left it
there just to be safe.
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
* PHP-5.3:
Improve json_encode error handling
- BFN
Conflicts:
ext/json/json.c
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
json_encode() now returns bool(false) for all possible errors, throws the
respective warning and also sets the respective json_last_error() error
code. Three new error codes have been added:
* JSON_ERROR_RECURSION
* JSON_ERROR_INF_OR_NAN
* JSON_ERROR_UNSUPPORTED_TYPE
To get a partial JSON output instead of bool(false) the option
JSON_PARTIAL_OUTPUT_ON_ERROR can be specified. In this case the invalid
segments will be replaced either by null (for recursion, unsupported type
and invalid JSON) or 0 (for Inf and NaN).
The warning for invalid UTF-8 stays intact and is thrown also with
display_errors = On. If this behavior is undesired this can be remedied
later.
|
| | | |
|
| | | |
|
