]>
granicus.if.org Git - php/log
Xinchen Hui [Sat, 28 May 2016 08:12:10 +0000 (16:12 +0800)]
Added NEWS Entry
Lauri Kenttä [Tue, 24 May 2016 14:33:44 +0000 (17:33 +0300)]
Test for bug #72221, segfault in zend_memnstr_ex
Lauri Kenttä [Sat, 21 May 2016 15:46:00 +0000 (18:46 +0300)]
Fix bug #72221 (segfault, past-the-end access)
Ferenc Kovacs [Thu, 26 May 2016 01:05:52 +0000 (03:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Ferenc Kovacs [Thu, 26 May 2016 01:05:06 +0000 (03:05 +0200)]
update NEWS
Adam Harvey [Wed, 25 May 2016 17:47:49 +0000 (12:47 -0500)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix typo in phpdbg help.
Adam Harvey [Wed, 25 May 2016 17:47:16 +0000 (12:47 -0500)]
Fix typo in phpdbg help.
Sorry, I would have included this in the last push had I spotted it a
minute earlier.
Adam Harvey [Wed, 25 May 2016 17:40:23 +0000 (12:40 -0500)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add missing newlines to phpdbg's help for the run command.
Adam Harvey [Wed, 25 May 2016 17:38:41 +0000 (12:38 -0500)]
Add missing newlines to phpdbg's help for the run command.
This is not at all related to needing screenshots for a talk I'm giving
in two days. No sir. Not at all.
Remi Collet [Wed, 25 May 2016 14:19:52 +0000 (16:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Skip test which is 64bits only
Remi Collet [Wed, 25 May 2016 14:17:12 +0000 (16:17 +0200)]
Skip test which is 64bits only
Diff from test output
001+ Warning: fread(): Length parameter must be greater than 0 in ...
001- Warning: fread(): Length parameter must be no more than
2147483647 in ...
Anatol Belski [Wed, 25 May 2016 09:30:00 +0000 (11:30 +0200)]
update NEWS
Anatol Belski [Wed, 25 May 2016 09:21:16 +0000 (11:21 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test portability
Anatol Belski [Wed, 25 May 2016 09:19:19 +0000 (11:19 +0200)]
fix test portability
Anatol Belski [Wed, 25 May 2016 09:15:39 +0000 (11:15 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.22RC1
Stanislav Malyshev [Wed, 25 May 2016 03:51:52 +0000 (20:51 -0700)]
Merge branch 'PHP-7.0.7' into PHP-7.0
* PHP-7.0.7:
Fix memory leak in imagescale()
Update NEWS
Better fix for bug #72135
Fixed bug #72227: imagescale out-of-bounds read
Fix bug #72241: get_icu_value_internal out-of-bounds read
Fix bug #72135 - don't create strings with lengths outside int range
set versions
Add check for string overflow to all string add operations
Fix bug #72114 - int/size_t confusion in fread
Updated NEWS
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 25 May 2016 00:58:37 +0000 (17:58 -0700)]
Merge branch 'PHP-5.5' into PHP-7.0.7
* PHP-5.5:
Fix memory leak in imagescale()
Update NEWS
Better fix for bug #72135
Fixed bug #72227: imagescale out-of-bounds read
Fix bug #72241: get_icu_value_internal out-of-bounds read
Fix bug #72135 - don't create strings with lengths outside int range
Add check for string overflow to all string add operations
Fix bug #72114 - int/size_t confusion in fread
Updated NEWS
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Conflicts:
Zend/zend_operators.c
ext/intl/locale/locale_methods.c
ext/phar/dirstream.c
ext/phar/tests/bug71331.phpt
ext/standard/file.c
ext/standard/html.c
Stanislav Malyshev [Wed, 25 May 2016 00:21:22 +0000 (17:21 -0700)]
Merge branch 'PHP-5.6.22' into PHP-5.6
* PHP-5.6.22:
Fix memory leak in imagescale()
Update NEWS
Better fix for bug #72135
Fixed bug #72227: imagescale out-of-bounds read
Fix bug #72241: get_icu_value_internal out-of-bounds read
Fix bug #72135 - don't create strings with lengths outside int range
prepare for 5.6.22RC1
Add check for string overflow to all string add operations
Fix bug #72114 - int/size_t confusion in fread
Updated NEWS
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 24 May 2016 23:35:12 +0000 (16:35 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6.22
* PHP-5.5:
Fix memory leak in imagescale()
Update NEWS
Better fix for bug #72135
Fixed bug #72227: imagescale out-of-bounds read
Fix bug #72241: get_icu_value_internal out-of-bounds read
Fix bug #72135 - don't create strings with lengths outside int range
Add check for string overflow to all string add operations
Fix bug #72114 - int/size_t confusion in fread
Updated NEWS
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Conflicts:
Zend/zend_operators.c
ext/phar/dirstream.c
ext/phar/tests/bug71331.phpt
Stanislav Malyshev [Tue, 24 May 2016 23:12:01 +0000 (16:12 -0700)]
Fix memory leak in imagescale()
Stanislav Malyshev [Tue, 24 May 2016 22:56:02 +0000 (15:56 -0700)]
Update NEWS
Stanislav Malyshev [Tue, 24 May 2016 22:52:15 +0000 (15:52 -0700)]
Better fix for bug #72135
Stanislav Malyshev [Mon, 23 May 2016 07:28:02 +0000 (00:28 -0700)]
Fixed bug #72227: imagescale out-of-bounds read
Ported from https://github.com/libgd/libgd/commit/
4f65a3e4eedaffa1efcf9ee1eb08f0b504fbc31a
Stanislav Malyshev [Mon, 23 May 2016 00:49:02 +0000 (17:49 -0700)]
Fix bug #72241: get_icu_value_internal out-of-bounds read
Derick Rethans [Wed, 18 May 2016 11:19:49 +0000 (12:19 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Wed, 18 May 2016 11:19:11 +0000 (12:19 +0100)]
Fixed bug #63740 (strtotime seems to use both sunday and monday as start of week)
Dmitry Stogov [Tue, 17 May 2016 14:16:10 +0000 (17:16 +0300)]
Use PHP_VERSION as OPcahce version
Xinchen Hui [Tue, 17 May 2016 10:07:20 +0000 (18:07 +0800)]
Let's only read-only here
Xinchen Hui [Tue, 17 May 2016 09:40:26 +0000 (17:40 +0800)]
Fixed bug #72229 (Wrong reference when serialize/unserialize an object)
Anatol Belski [Mon, 16 May 2016 17:30:38 +0000 (19:30 +0200)]
update NEWS
Thomas Punt [Sat, 16 Apr 2016 09:51:40 +0000 (10:51 +0100)]
Tidy up
Thomas Punt [Sat, 16 Apr 2016 08:33:01 +0000 (09:33 +0100)]
Remove unnecessary boundary checks
Thomas Punt [Fri, 15 Apr 2016 22:13:50 +0000 (23:13 +0100)]
Resolve bug #72017
Xinchen Hui [Mon, 16 May 2016 13:23:55 +0000 (06:23 -0700)]
Revert "Revert the ABI break commit"
This reverts commit
07220f615b432837e158820fa08206fcc78c93e2 .
Xinchen Hui [Mon, 16 May 2016 13:21:11 +0000 (06:21 -0700)]
Revert "Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)""
obviously I read the change is in argument lists by mistake :<
This reverts commit
9e7afa75140afd047cb95280a610cff9368a7517 .
Xinchen Hui [Mon, 16 May 2016 06:48:13 +0000 (14:48 +0800)]
Correct name, it was typed in habitually
Stanislav Malyshev [Mon, 16 May 2016 06:26:51 +0000 (23:26 -0700)]
Fix bug #72135 - don't create strings with lengths outside int range
Xinchen Hui [Mon, 16 May 2016 03:24:39 +0000 (11:24 +0800)]
Revert the ABI break commit
Xinchen Hui [Mon, 16 May 2016 03:24:16 +0000 (11:24 +0800)]
Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)"
ABI break
This reverts commit
fb951553be0175712f4b757e05004110d7421e04 .
Xinchen Hui [Mon, 16 May 2016 03:19:45 +0000 (11:19 +0800)]
Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
Joe Watkins [Sat, 14 May 2016 07:20:41 +0000 (08:20 +0100)]
fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
Joe Watkins [Sat, 14 May 2016 07:10:16 +0000 (08:10 +0100)]
fix #72206 (xml_parser_create/xml_parser_free leaks mem)
Joe Watkins [Fri, 13 May 2016 11:47:36 +0000 (12:47 +0100)]
Joe Watkins [Fri, 13 May 2016 08:25:15 +0000 (09:25 +0100)]
Joe Watkins [Fri, 13 May 2016 06:41:11 +0000 (07:41 +0100)]
fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)
Anatol Belski [Thu, 12 May 2016 18:37:04 +0000 (20:37 +0200)]
fix dir separator in test
Anatol Belski [Thu, 12 May 2016 11:39:15 +0000 (13:39 +0200)]
update NEWS
Anatol Belski [Thu, 12 May 2016 10:45:04 +0000 (12:45 +0200)]
workaround the extra new line in the test out on another env
Anatol Belski [Thu, 12 May 2016 09:40:28 +0000 (11:40 +0200)]
Fixed bug #72197 pg_lo_create arbitrary read
Xinchen Hui [Thu, 12 May 2016 05:48:24 +0000 (13:48 +0800)]
Added NEWS entry missed while doing merge
Xinchen Hui [Thu, 12 May 2016 05:40:22 +0000 (13:40 +0800)]
Committed by accident
Xinchen Hui [Thu, 12 May 2016 05:16:07 +0000 (13:16 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Fix serializing ZEND_AST_SHELL_EXEC
add missing NEWS entry
prepare for 5.6.22RC1
add missing NEWS entry
Xinchen Hui [Thu, 12 May 2016 05:15:33 +0000 (13:15 +0800)]
Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free)
Sara Golemon [Thu, 12 May 2016 02:28:57 +0000 (02:28 +0000)]
Fix serializing ZEND_AST_SHELL_EXEC
Currently, `foo` is reserialized as `'foo'` due to misuse of zend_ast_export().
ZEND_AST_SHELL_EXEC can only contain ZEND_AST_ZVAL(string) or ZEND_AST_ENCAPS_LIST,
so just handle the ZEND_AST_ZVAL(string) case directly.
Ferenc Kovacs [Wed, 11 May 2016 21:34:15 +0000 (23:34 +0200)]
prepare for 5.6.22RC1
Ferenc Kovacs [Wed, 11 May 2016 21:31:52 +0000 (23:31 +0200)]
add missing NEWS entry
Ferenc Kovacs [Wed, 11 May 2016 21:31:09 +0000 (23:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.22RC1
add missing NEWS entry
Ferenc Kovacs [Wed, 11 May 2016 21:30:04 +0000 (23:30 +0200)]
prepare for 5.6.22RC1
Ferenc Kovacs [Wed, 11 May 2016 21:29:23 +0000 (23:29 +0200)]
add missing NEWS entry
Xinchen Hui [Wed, 11 May 2016 09:31:46 +0000 (17:31 +0800)]
Fixed Bug #72193 (dns_get_record returns array containing elements of type 'unknown')
Xinchen Hui [Wed, 11 May 2016 03:12:27 +0000 (11:12 +0800)]
Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound)
Derick Rethans [Tue, 10 May 2016 19:40:03 +0000 (15:40 -0400)]
Allow for special case for the opcache zend extension
Anatol Belski [Tue, 10 May 2016 18:02:17 +0000 (20:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix handle leak
Anatol Belski [Tue, 10 May 2016 17:59:21 +0000 (19:59 +0200)]
fix handle leak
Dmitry Stogov [Tue, 10 May 2016 14:53:33 +0000 (17:53 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
The "flock" structure has to be writable on AIX.
Dmitry Stogov [Tue, 10 May 2016 14:50:14 +0000 (17:50 +0300)]
The "flock" structure has to be writable on AIX.
Anatol Belski [Tue, 10 May 2016 11:16:44 +0000 (13:16 +0200)]
set versions
Anatol Belski [Tue, 10 May 2016 11:06:55 +0000 (13:06 +0200)]
prepare next 7.0.8
Nikita Popov [Tue, 10 May 2016 10:13:10 +0000 (12:13 +0200)]
Fixed bug #72174
Also fixes a memory leak if ::getValue() is used with __get().
Stanislav Malyshev [Tue, 10 May 2016 05:17:20 +0000 (22:17 -0700)]
Add check for string overflow to all string add operations
Stanislav Malyshev [Tue, 10 May 2016 04:55:29 +0000 (21:55 -0700)]
Fix bug #72114 - int/size_t confusion in fread
Anatol Belski [Mon, 9 May 2016 16:51:54 +0000 (18:51 +0200)]
update NEWS
Anatol Belski [Mon, 9 May 2016 16:51:25 +0000 (18:51 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Mon, 9 May 2016 16:50:40 +0000 (18:50 +0200)]
update NEWS
Anatol Belski [Mon, 9 May 2016 15:25:53 +0000 (17:25 +0200)]
Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor"
This reverts commit
b4eedd128ba9f61be08a50c94afd72837d7cf70b .
This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
Anatol Belski [Mon, 9 May 2016 15:23:40 +0000 (17:23 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Revert "Backport patch for bug #71820"
Anatol Belski [Mon, 9 May 2016 15:15:40 +0000 (17:15 +0200)]
Revert "Backport patch for bug #71820"
This reverts commit
1b632cfe834bfd87d182566d7d960df7d10ded72 .
This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
Anatol Belski [Sun, 8 May 2016 13:12:20 +0000 (15:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #64524 Add intl.use_exceptions to php.ini-*
Anatol Belski [Sun, 8 May 2016 13:09:50 +0000 (15:09 +0200)]
Fixed bug #64524 Add intl.use_exceptions to php.ini-*
Xinchen Hui [Sun, 8 May 2016 05:04:20 +0000 (22:04 -0700)]
Fixed test
Xinchen Hui [Sat, 7 May 2016 07:07:04 +0000 (00:07 -0700)]
Strlen cleanup (additions for previous one fix)
Probably compilers will do similar optimization
Xinchen Hui [Sat, 7 May 2016 06:52:48 +0000 (23:52 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_strtod.c
Xinchen Hui [Sat, 7 May 2016 06:52:06 +0000 (23:52 -0700)]
Fixed bug #72172 (zend_hex_strtod should not use strlen)
Xinchen Hui [Fri, 6 May 2016 12:25:24 +0000 (20:25 +0800)]
Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"
This reverts commit
459a7cc209da130256d66c1f896199540f4dadbc .
Xinchen Hui [Fri, 6 May 2016 10:38:26 +0000 (18:38 +0800)]
Fixed bug #72170 (JsonSerializable may inc apply count without dec it)
I don't want use zend_try here, but seems I have no choice :<
Anatol Belski [Fri, 6 May 2016 07:41:21 +0000 (09:41 +0200)]
update NEWS
Anatol Belski [Fri, 6 May 2016 07:39:02 +0000 (09:39 +0200)]
reorder entry alphabetically
Anatol Belski [Fri, 6 May 2016 07:30:41 +0000 (09:30 +0200)]
Re-fix #72165
Reverted previous wrong patch, throw warning for numeric keys.
Numeric field names are not supported, see "distinguished name"
section here https://www.openssl.org/docs/manmaster/apps/req.html
Anatol Belski [Fri, 6 May 2016 07:19:04 +0000 (09:19 +0200)]
Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new"
This reverts commit
7277c85765d1053c8cd1d1093902df541b3d101a .
Anatol Belski [Fri, 6 May 2016 07:00:58 +0000 (09:00 +0200)]
Fixed bug #72165 Null pointer dereference - openssl_csr_new
Xinchen Hui [Fri, 6 May 2016 02:51:38 +0000 (10:51 +0800)]
Fixed test
Xinchen Hui [Fri, 6 May 2016 02:45:44 +0000 (10:45 +0800)]
Revert "Fix bug #72162 (again)"
The problem is because we release p->value too early
and later you try to convert an object to string, which is a fatal error
then leave p->value double free, change to expect long is a BC break
This reverts commit
8e5b38100411d3b8fa4486c7c41dec7dedb4b474 .
Nikita Popov [Thu, 5 May 2016 15:28:52 +0000 (17:28 +0200)]
Fix bug #72162 (again)
Not sure what the previous fix was supposed to do. The issue was
that error_reporting() simply assumes that the value must either
be an integer or a string.
Fixed by using zpp properly.
Xinchen Hui [Thu, 5 May 2016 09:27:34 +0000 (17:27 +0800)]
Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace)
Xinchen Hui [Thu, 5 May 2016 07:18:17 +0000 (15:18 +0800)]
Fixed bug #72154 (pcntl_wait/pcntl_waitpid array internal structure overwrite)
Xinchen Hui [Thu, 5 May 2016 03:12:17 +0000 (11:12 +0800)]
Fixed bug #72157 (use-after-free caused by dba_open)
Xinchen Hui [Thu, 5 May 2016 03:02:21 +0000 (11:02 +0800)]
Fixed bug #72162 (use-after-free - error_reporting)
Nikita Popov [Wed, 4 May 2016 21:52:42 +0000 (23:52 +0200)]
Fix JMPZ, JMPZNZ_EX chain optimization
The result_type was not copied, resulting in a corrupted JMPZ_EX.
Fix can be verified by inspecting the opcodes of the following
function (it should not contain any _EX opcodes):
function test() {
if ($a && $b) {
echo "a";
}
if ($b || $c || $d) {
echo "b";
}
}
Conflicts:
ext/opcache/Optimizer/block_pass.c
Nikita Popov [Wed, 4 May 2016 16:42:16 +0000 (18:42 +0200)]
Fix bug #72159
Anatol Belski [Wed, 4 May 2016 16:14:11 +0000 (18:14 +0200)]
fix NEWS, patch for #71428 was reverted