summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Collapse)AuthorAgeFilesLines
* Unwrap reference returns in cufa etcNikita Popov2016-09-302-0/+42
|
* Cleanup exception handling after zend_fetch_class_by_nameXinchen Hui2016-09-302-118/+75
|
* Use smart branchXinchen Hui2016-09-302-35/+14
|
* zval_dtor_func_for_ptr() -> zval_dtor_func()Dmitry Stogov2016-09-291-1/+1
|
* Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-09-291-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 Stogov2016-09-291-3/+11
| | | | | | | | variable)
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-284-2/+38
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-09-284-2/+38
| |\
| | * Handle resource keys in constexpr arraysNikita Popov2016-09-282-0/+18
| | |
| | * Fix the constant array case as wellNikita Popov2016-09-283-3/+15
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-283-17/+84
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-09-283-17/+84
| |\ \ | | |/
| | * Check next_index_insert failure in ADD_ARRAY_ELEMENTNikita Popov2016-09-283-21/+100
| | |
* | | Combine code for keyed/unkeyed list()Nikita Popov2016-09-281-58/+29
| | |
* | | Fix segfault when empty entry in keyed array assignmentNikita Popov2016-09-282-8/+20
| | |
* | | fix exports which are now referenced by phpdbgAnatol Belski2016-09-282-4/+4
| | | | | | | | | | | | (cherry picked from commit cd0f1c8a5ed6d4e677dbf891fc69326e5b05cccc)
* | | Revert ReflectionType::__toString() behavior + deprecateNikita Popov2016-09-283-3/+3
| | |
* | | Add phpdbg generator commandBob Weinand2016-09-282-5/+8
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-272-2/+26
|\ \ \ | |/ /
| * | Fix bug #73181Nikita Popov2016-09-272-2/+26
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-261-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #73172 parse error: Invalid numeric literal
| * | Fixed bug #73172 parse error: Invalid numeric literalAnatol Belski2016-09-261-2/+2
| | |
* | | On PHP-7.1 and above we have to check CALL_INFO instead of symbol_table.Dmitry Stogov2016-09-261-1/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-09-262-3/+77
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #73156 (segfault on undefined function)
| * | Fixed bug #73156 (segfault on undefined function)Dmitry Stogov2016-09-262-3/+77
| | |
* | | Use SEND_USER for CONST|TMP as wellNikita Popov2016-09-255-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 bugsNikita Popov2016-09-241-0/+56
| | | | | | | | | | | | Account for possible null return values better.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-241-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-241-2/+2
| |\ \ | | |/
| | * Merge branch 'pull-request/2120' into PHP-5.6Christoph M. Becker2016-09-241-2/+2
| | |\
| | | * Fix potential memory issue with USE_ZEND_ALLOC=0Christoph M. Becker2016-09-071-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.1Nikita Popov2016-09-242-11/+34
|\ \ \ \ | |/ / /
| * | | Fixed bug #73163Nikita Popov2016-09-242-29/+41
| | | |
| * | | Fix bug #69579John Boehr2016-09-226-9/+55
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-226-9/+48
|\ \ \ \
| * | | | Fix bug #69579John Boehr2016-09-226-9/+55
| | | | |
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-09-201-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.0Dmitry Stogov2016-09-201-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 Stogov2016-09-201-1/+7
| | | | | | | | | | | | | | | | zend_hash_apply()
| | * | missed semicolonAnatol Belski2016-09-131-1/+1
| | | |
| | * | fix C89 conformityAnatol Belski2016-09-131-3/+3
| | | |
| | * | Fix bug #73052 - Memory Corruption in During Deserialized-object DestructionStanislav Malyshev2016-09-121-3/+3
| | | |
| | * | Fix various int size overflows.Stanislav Malyshev2016-09-124-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 robustNikita Popov2016-09-171-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 Akishige2016-09-181-1/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-161-2/+8
|\ \ \ | |/ /
| * | Disable add/sub asm for gcc 4.9 pic/pie buildsMichael Orlitzky2016-09-161-2/+8
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-09-132-0/+22
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #73067 (__debugInfo crashes when throwing an exception)
| * | Fixed bug #73067 (__debugInfo crashes when throwing an exception)Xinchen Hui2016-09-132-0/+22
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Andrea Faulds2016-09-114-86/+3
|\ \ \ | |/ /