Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Unwrap reference returns in cufa etc | Nikita Popov | 2016-09-30 | 2 | -0/+42 |
| | |||||
* | Cleanup exception handling after zend_fetch_class_by_name | Xinchen Hui | 2016-09-30 | 2 | -118/+75 |
| | |||||
* | Use smart branch | Xinchen Hui | 2016-09-30 | 2 | -35/+14 |
| | |||||
* | zval_dtor_func_for_ptr() -> zval_dtor_func() | Dmitry Stogov | 2016-09-29 | 1 | -1/+1 |
| | |||||
* | Merge branch 'PHP-7.0' into PHP-7.1 | Dmitry Stogov | 2016-09-29 | 1 | -3/+11 |
|\ | | | | | | | | | * PHP-7.0: Better fix for bug #72854 (avoid extra copy and creating reference to stack variable) | ||||
| * | Better fix for bug #72854 (avoid extra copy and creating reference to stack ↵ | Dmitry Stogov | 2016-09-29 | 1 | -3/+11 |
| | | | | | | | | variable) | ||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-09-28 | 4 | -2/+38 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2016-09-28 | 4 | -2/+38 |
| |\ | |||||
| | * | Handle resource keys in constexpr arrays | Nikita Popov | 2016-09-28 | 2 | -0/+18 |
| | | | |||||
| | * | Fix the constant array case as well | Nikita Popov | 2016-09-28 | 3 | -3/+15 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-09-28 | 3 | -17/+84 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2016-09-28 | 3 | -17/+84 |
| |\ \ | | |/ | |||||
| | * | Check next_index_insert failure in ADD_ARRAY_ELEMENT | Nikita Popov | 2016-09-28 | 3 | -21/+100 |
| | | | |||||
* | | | Combine code for keyed/unkeyed list() | Nikita Popov | 2016-09-28 | 1 | -58/+29 |
| | | | |||||
* | | | Fix segfault when empty entry in keyed array assignment | Nikita Popov | 2016-09-28 | 2 | -8/+20 |
| | | | |||||
* | | | fix exports which are now referenced by phpdbg | Anatol Belski | 2016-09-28 | 2 | -4/+4 |
| | | | | | | | | | | | | (cherry picked from commit cd0f1c8a5ed6d4e677dbf891fc69326e5b05cccc) | ||||
* | | | Revert ReflectionType::__toString() behavior + deprecate | Nikita Popov | 2016-09-28 | 3 | -3/+3 |
| | | | |||||
* | | | Add phpdbg generator command | Bob Weinand | 2016-09-28 | 2 | -5/+8 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-09-27 | 2 | -2/+26 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #73181 | Nikita Popov | 2016-09-27 | 2 | -2/+26 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-09-26 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: Fixed bug #73172 parse error: Invalid numeric literal | ||||
| * | | Fixed bug #73172 parse error: Invalid numeric literal | Anatol Belski | 2016-09-26 | 1 | -2/+2 |
| | | | |||||
* | | | On PHP-7.1 and above we have to check CALL_INFO instead of symbol_table. | Dmitry Stogov | 2016-09-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Dmitry Stogov | 2016-09-26 | 2 | -3/+77 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: Fixed bug #73156 (segfault on undefined function) | ||||
| * | | Fixed bug #73156 (segfault on undefined function) | Dmitry Stogov | 2016-09-26 | 2 | -3/+77 |
| | | | |||||
* | | | Use SEND_USER for CONST|TMP as well | Nikita Popov | 2016-09-25 | 5 | -33/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we're missing the "expected to be a reference, value given" warning that appears for ordinary calls to call_user_func(). Also update an UPGRADING note with recent changes wrt call_user_func(). | ||||
* | | | Fix a couple of ASSIGN_DIM/OBJ inference bugs | Nikita Popov | 2016-09-24 | 1 | -0/+56 |
| | | | | | | | | | | | | Account for possible null return values better. | ||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2016-09-24 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Christoph M. Becker | 2016-09-24 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'pull-request/2120' into PHP-5.6 | Christoph M. Becker | 2016-09-24 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Fix potential memory issue with USE_ZEND_ALLOC=0 | Christoph M. Becker | 2016-09-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PHP core and extensions are written with the assumption that memory allocation either succeeds, or the allocator bails out (i.e. the allocator is infallible). Therefore the result of emalloc() and friends are not checked for NULL values. However, with USE_ZEND_ALLOC=0, malloc() and friends are used as allocators, but these are fallible, i.e. they return NULL instead of bailing out if they fail. This easily leads to invalid memory accesses in the following, such as in <https://bugs.php.net/73032>. Some of these cases may constitute exploitable vulnerabilities. Therefore we make the infallible __zend_alloc() and friends the default for USE_ZEND_ALLOC=0. | ||||
* | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-09-24 | 2 | -11/+34 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug #73163 | Nikita Popov | 2016-09-24 | 2 | -29/+41 |
| | | | | |||||
| * | | | Fix bug #69579 | John Boehr | 2016-09-22 | 6 | -9/+55 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-09-22 | 6 | -9/+48 |
|\ \ \ \ | |||||
| * | | | | Fix bug #69579 | John Boehr | 2016-09-22 | 6 | -9/+55 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Dmitry Stogov | 2016-09-20 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | * PHP-7.0: Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply() | ||||
| * | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Dmitry Stogov | 2016-09-20 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | * PHP-5.6: Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply() | ||||
| | * | | Fixed inconsistent meaning of zend_startup_module_ex() return value used in ↵ | Dmitry Stogov | 2016-09-20 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | zend_hash_apply() | ||||
| | * | | missed semicolon | Anatol Belski | 2016-09-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix C89 conformity | Anatol Belski | 2016-09-13 | 1 | -3/+3 |
| | | | | |||||
| | * | | Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction | Stanislav Malyshev | 2016-09-12 | 1 | -3/+3 |
| | | | | |||||
| | * | | Fix various int size overflows. | Stanislav Malyshev | 2016-09-12 | 4 | -12/+76 |
| | |/ | | | | | | | | | | | | | Add function for detection of string zvals with length that does not fit INT_MAX. | ||||
| * | | Make zval_ptr_dtor / _zval_dtor_func more robust | Nikita Popov | 2016-09-17 | 1 | -11/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, allow arrays with refcount>1, like we already allow for all other types. _zval_dtor_func is now the same as _zval_dtor_func_for_ptr with an extra refcount decrement check at the start. At this point we might as well drop it... Cherry-pick of ded69ee6e6039d56ee7b65b1a578ed1e3d1859da from PHP-7.1. | ||||
* | | | when needle is short, Sunday algorithm is slower than glibc memchr() | TAKEKOSHI Akishige | 2016-09-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-09-16 | 1 | -2/+8 |
|\ \ \ | |/ / | |||||
| * | | Disable add/sub asm for gcc 4.9 pic/pie builds | Michael Orlitzky | 2016-09-16 | 1 | -2/+8 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2016-09-13 | 2 | -0/+22 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: Fixed bug #73067 (__debugInfo crashes when throwing an exception) | ||||
| * | | Fixed bug #73067 (__debugInfo crashes when throwing an exception) | Xinchen Hui | 2016-09-13 | 2 | -0/+22 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Andrea Faulds | 2016-09-11 | 4 | -86/+3 |
|\ \ \ | |/ / |