Anatol Belski
65a2c451bb
fix test portability
10 years ago
Anatol Belski
67dbb9b907
Merge branch 'PHP-7.0'
* PHP-7.0:
prepare for 5.6.22RC1
10 years ago
Anatol Belski
8dab872a43
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.22RC1
10 years ago
Stanislav Malyshev
4ba0197f87
Merge branch 'PHP-7.0'
* PHP-7.0:
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()
10 years ago
Stanislav Malyshev
2fe563e8d8
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
10 years ago
Stanislav Malyshev
3ed0114e7f
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
10 years ago
Stanislav Malyshev
2464b092eb
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
10 years ago
Stanislav Malyshev
544940c48a
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
10 years ago
Stanislav Malyshev
9a826a3bd9
Fix memory leak in imagescale()
10 years ago
Stanislav Malyshev
f423e1bb89
Update NEWS
10 years ago
Stanislav Malyshev
e955913115
Better fix for bug #72135
10 years ago
Dmitry Stogov
2ae21abdf7
Fixed bug #72213 (Finally leaks on nested exceptions).
Squashed commit of the following:
commit 8461b0407f
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed May 25 00:34:42 2016 +0300
Rmoved zend_try_catch_element.parent and walk through op_array.try_catch_array backward from the current try_cacth_offset.
commit 0c71e24964
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed May 25 00:04:53 2016 +0300
Move SAVE_OPLINE() to its original place
commit 111432a4df
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed May 25 00:01:10 2016 +0300
Separate the common part of ZEND_HANDLE_EXCEPTION and FAST_RET into zend_dispatch_try_catch_finally_helper.
commit 4f21c06c2e
Author: Nikita Popov <nikic@php.net>
Date: Tue May 24 14:55:27 2016 +0200
Improve finally fix
commit da5c727499
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue May 24 10:36:08 2016 +0300
Fixed Zend/tests/try/bug70228_3.phpt and Zend/tests/try/bug70228_4.phpt
commit cfcedf2fb4
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue May 24 02:59:27 2016 +0300
Added test
commit 4c6aa93d43
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue May 24 00:38:20 2016 +0300
Added tests
commit 8a8f4704b0
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon May 23 23:27:34 2016 +0300
Fixed bug #72213 (Finally leaks on nested exceptions)
10 years ago
Nikita Popov
91f5940329
Forbid dynamic calls to scope introspection functions
Per RFC:
https://wiki.php.net/rfc/forbid_dynamic_scope_introspection
10 years ago
Nikita Popov
674297c7e4
Allow empty property names
Conflicts:
Zend/zend_compile.c
10 years ago
Nikita Popov
a19eb8e34a
Ensure no entry predecessors for SSA construction
10 years ago
Nikita Popov
e745b4cad8
Replace BB end with BB len
And support empty blocks everywhere.
10 years ago
Lauri Kenttä
ad98f573f6
Test for bug #72221 , segfault in zend_memnstr_ex
10 years ago
Dmitry Stogov
9b27df8df5
Fixed white-spaces
10 years ago
Stanislav Malyshev
7a1aac3343
Fixed bug #72227 : imagescale out-of-bounds read
Ported from 4f65a3e4ee
10 years ago
Dmitry Stogov
0cdbabe558
Merge branch 'nullable_types' of github.com:morrisonlevi/php-src
* 'nullable_types' of github.com:morrisonlevi/php-src:
Fix bug #71428
Add nullable parameter types
Implement nullable return types.
10 years ago
Stanislav Malyshev
97eff7eb57
Fix bug #72241 : get_icu_value_internal out-of-bounds read
10 years ago
Nikita Popov
0d62dfdf81
Improve previous fix
Do not mark loop var free blocks as reachable after all -- as we
can't construct SSA for unreachable blocks, this would cause
issues down the line.
Instead add an extra UNREACHABLE_FREE flag and retain only the
FREE instruction during NOP removal. (If we retain all
instructions in the BB we might leave a jump instruction that goes
into the nowhere.)
10 years ago
Nikita Popov
fa9566627b
Fix reachability detection if live ranges aren't split
Even if we don't split, we still want to keep the same logic for
reachibility detection.
10 years ago
Lauri Kenttä
26fa27d760
Fix bug #72221 (segfault, past-the-end access)
10 years ago
Bob Weinand
4f077aee83
Allow for [] = $array; (alias for list())
10 years ago
Dmitry Stogov
14a71cf545
Added and fixed tests related to "finally" handling
10 years ago
Dmitry Stogov
88196e9151
Added specialized handler for ZEND_FETCH_DIM_R opcode with only numeric indexes.
10 years ago
Derick Rethans
932c9520bc
Merge branch 'PHP-7.0'
10 years ago
Derick Rethans
c572968900
Merge branch 'PHP-5.6' into PHP-7.0
10 years ago
Derick Rethans
f43f6fc39b
Fixed bug #63740 (strtotime seems to use both sunday and monday as start of week)
10 years ago
Dmitry Stogov
cef8d93edd
Fixed typo
10 years ago
Nikita Popov
14023d39c1
Move builtin_ctzl portability into zend_bitset.h
Use this function in both zend_mm_bitset_find_one and
zend_bitset_first.
Maybe zend_bitset.h is not quite the right place for it, but I did
not want to include this in a globally included header like
zend_long.h or zend_portability.h.
10 years ago
Dmitry Stogov
0d77222473
Merge branch 'PHP-7.0'
* PHP-7.0:
Use PHP_VERSION as OPcahce version
10 years ago
Dmitry Stogov
d41920c57d
Use PHP_VERSION as OPcahce version
10 years ago
Nikita Popov
b65b15c6f4
Mark assert() as INDIRECT_VAR_ACCESS
I don't like this... we may want to detect "obviously not string"
operands by checking for the result of a comparison instruction.
10 years ago
Xinchen Hui
37b1226af1
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Inlined fast paths of the freqently execute handlers for FETCH_DIM_R.
10 years ago
Xinchen Hui
fad91468db
Revert "Fixed Bug #72213 (Finally leaks on nested exceptions)"
This reverts commit 5037ebf058
.
10 years ago
Dmitry Stogov
c466df6813
Inlined fast paths of the freqently execute handlers for FETCH_DIM_R.
10 years ago
Xinchen Hui
0c8879e3da
Merge branch 'PHP-7.0'
* PHP-7.0:
Let's only read-only here
10 years ago
Xinchen Hui
2eb7e75c25
Let's only read-only here
10 years ago
Xinchen Hui
b27ecb5026
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
10 years ago
Xinchen Hui
60d743dd3b
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72229 (Wrong reference when serialize/unserialize an object)
10 years ago
Xinchen Hui
7989db975f
Fixed bug #72229 (Wrong reference when serialize/unserialize an object)
10 years ago
Dmitry Stogov
34a6c93b25
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
10 years ago
Xinchen Hui
5037ebf058
Fixed Bug #72213 (Finally leaks on nested exceptions)
10 years ago
Dmitry Stogov
8f7b1a3248
IS_CONST operands don't have to be separated. Use reference-counting instead of duplication.
- with opcache all IS_CONST operands are not refcounted (scalars, interned strings or immutable arrays)
- without opcache IS_CONST operands are not shared between processes or threads and may use common reference counters
10 years ago
Dmitry Stogov
1fe7b3bca1
micro-optimisation
10 years ago
Anatol Belski
41cb432ec4
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Tidy up
Remove unnecessary boundary checks
Resolve bug #72017
10 years ago
Anatol Belski
7e5ea3c305
update NEWS
10 years ago
Thomas Punt
0e21742bf8
Tidy up
10 years ago