php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 21:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,156 Commits 547 Branches 1,483 Tags
6eb4daabeb69cc426fe2c19c473acb35af05502a
Commit Graph

2654 Commits

Author SHA1 Message Date
Dmitry Stogov
503df277ab Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed indirect modification of magic ArrayAccess method arguments
 2017-10-26 16:04:20 +03:00
Dmitry Stogov
98eee90734 Fixed indirect modification of magic ArrayAccess method arguments 2017-10-26 16:03:42 +03:00
Dmitry Stogov
d3146889ab Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Backport tests
 2017-10-26 14:12:33 +03:00
Dmitry Stogov
502cfddf28 Backport tests 2017-10-26 14:12:08 +03:00
Dmitry Stogov
177cdcf313 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed indirect modification of magic method arguments.
 2017-10-26 13:11:59 +03:00
Dmitry Stogov
bc59289b7a Fixed indirect modification of magic method arguments. 2017-10-26 13:05:23 +03:00
Xinchen Hui
6b637ac589 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-10-26 10:23:52 +08:00
Xinchen Hui
eaeccc1d99 Fixed test 2017-10-26 10:23:43 +08:00
Xinchen Hui
3c4c9a23bc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

Conflicts:
	Zend/zend_object_handlers.c
 2017-10-26 10:08:39 +08:00
Xinchen Hui
d2047503cb Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS) 2017-10-26 10:07:08 +08:00
Andrea Faulds
4372293192 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-29 21:38:30 +01:00
Andrea Faulds
abefb6dfe7 Fix bug #75290 2017-09-29 21:38:08 +01:00
Xinchen Hui
e8c200515a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning
 2017-09-24 17:24:23 +08:00
Xinchen Hui
b05ff14a9a Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()). 2017-09-24 17:24:11 +08:00
Nikita Popov
628c257f71 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-24 08:54:36 +02:00
Nikita Popov
73d6456d7d Fixed bug #75252 2017-09-24 08:53:27 +02:00
Xinchen Hui
0ddda0dcb7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-07-27 12:50:28 +08:00
Xinchen Hui
9fcfe52d03 Fixed test 2017-07-27 12:50:17 +08:00
Bob Weinand
134e713be2 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-22 11:14:54 +02:00
Bob Weinand
bad5d0d6c5 Fixed bug #74954 (null deref and segfault in zend_generator_resume()) 2017-07-22 11:14:00 +02:00
Xinchen Hui
84926a0d71 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c
 2017-07-21 11:58:07 +08:00
Xinchen Hui
95d2908814 Fixed bug #74947 (Segfault in scanner on INF number) 2017-07-21 11:56:49 +08:00
Stanislav Malyshev
0ba04f7737 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 21:18:10 -07:00
Stanislav Malyshev
0525574913 Fix bug #74603 - use correct buffer size 2017-07-04 19:35:56 -07:00
Bob Weinand
af7bfc71fd Merge branch 'PHP-7.0' into PHP-7.1 2017-07-01 11:52:41 +02:00
Bob Weinand
e3cc15daf2 Fixed bug #74840 (Opcache overwrites argument of GENERATOR_RETURN within finally) 2017-07-01 11:52:03 +02:00
Nikita Popov
653b96347c Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 19:49:11 +02:00
Nikita Popov
2fddc4a7f1 Fixed bug #73900 2017-06-25 19:48:17 +02:00
Nikita Popov
bda0f4e8dc Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 15:30:29 +02:00
Nikita Popov
de66e80d75 Don't leave holes in func_get_args() and backtraces 
Argument lists should always be continuous and hole-free, even if
local variables are unset. Replace UNDEF values with NULLs.
 2017-06-25 15:27:45 +02:00
Xinchen Hui
cd3520c4d3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74657 (Undefined constants in array properties result in broken properties)
 2017-05-27 12:08:48 +08:00
Xinchen Hui
5269c4cacb Fixed bug #74657 (Undefined constants in array properties result in broken properties) 2017-05-27 12:06:43 +08:00
Bob Weinand
649494c0ee Fixed bug #74606 (Segfault within try/catch/finally nesting in Generators) 
Thanks to Nikita for pointing out the error source.
 2017-05-17 19:58:51 +02:00
Xinchen Hui
2c070847e7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())
 2017-05-08 11:32:27 +08:00
Xinchen Hui
87d56a3d07 Fixed bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER()) 2017-05-08 11:32:08 +08:00
Nikita Popov
2719b8e91c Merge branch 'PHP-7.0' into PHP-7.1 2017-04-15 18:15:33 +02:00
Nikita Popov
e433c23b96 Improve accuracy of opline lineno information 
If compile_var() was used instead of compile_expr() we did not
update the current lineno.
 2017-04-15 18:15:24 +02:00
David Matejka
2135b057ec Fixed bug #74444: multiple catch freezes in some cases 
zend_emit_jump() may reallocate, so reload the opline.
 2017-04-15 01:38:37 +02:00
Xinchen Hui
87e6e1982b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74408 (Endless loop bypassing execution time limit)
 2017-04-11 18:46:41 +08:00
Xinchen Hui
eb03f16442 Fixed bug #74408 (Endless loop bypassing execution time limit) 2017-04-11 18:46:16 +08:00
Nikita Popov
515e1e0cea Merge branch 'PHP-7.0' into PHP-7.1 2017-04-09 15:35:44 +02:00
Thomas Punt
744c4a5592 Resolve bug #74188 (undefined statics raising with ?? operator) 2017-04-09 15:29:31 +02:00
Nikita Popov
fe46a7da78 Fixed bug #74340 2017-04-02 13:30:35 +02:00
Sara Golemon
7835e2ebc5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug where `yield from` is captured too greedily
 2017-03-23 13:38:58 -07:00
Sara Golemon
0fb640c717 Fix bug where yield from is captured too greedily 
In the following piece of code:

```php
function from1234($x) {
  return $x;
}
function foo($x) {
  yield from1234($x);
}
```

The statement inside foo is taken as `yield from` `1234($x)`
which is neither the intent, nor even legal syntax for an fcall.

Do a lookahead for breaking non-label characters after the
`yield from` and only accept it if they occur.
 2017-03-23 13:31:06 -07:00
Nikita Popov
2bba4a0d7f Fix bug #69676 2017-03-15 19:49:02 +01:00
Nikita Popov
280e8dafe4 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-10 18:20:58 +01:00
Nikita Popov
29ee3e3c49 Fixed bug #73960 2017-03-10 18:20:32 +01:00
Sara Golemon
c5727a30cf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix potential crash when setting invalid declare value
 2017-02-28 17:17:41 -08:00
Sara Golemon
868930e079 Fix potential crash when setting invalid declare value 
Using a non-literal expression in a declare value can cause the
compiler to crash trying to turn that AST node into a usable zval.

There was an existing test for such values using 'encoding',
but that didn't crash because it's handled by the lexer
rather than being compiled.

Trying to use a non-literal with ticks reproduces the crash.
 2017-02-28 17:08:23 -08:00