clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
97,550 Commits 491 Branches 1,363 Tags 846 MiB
194ffefb9e
Commit Graph

11985 Commits

Author SHA1 Message Date
Joey
194ffefb9e Corrected typo in comment 
Finger-key interface malfunction.
 2016-08-11 18:28:50 +02:00
Andrea Faulds
ab45f13a0b Merge branch 'PHP-7.0' into PHP-7.1 2016-08-08 21:00:49 +01:00
Andrea Faulds
5358c7cf5e Replace dead branch with ZEND_ASSERT() 2016-08-08 20:56:11 +01:00
Nikita Popov
3859bcd1f8 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-05 19:56:27 +02:00
Nikita Popov
807e81937b Fix bug #72767 
The page size calculation did not account for the size of the
stack header (or rather it did account for it, but in the wrong
direction...)
 2016-08-05 19:55:10 +02:00
Nikita Popov
ec6d70db77 Fix leak on self-referencing constants 2016-08-03 23:10:09 +02:00
Nikita Popov
ca82574d7c Fix invalid free on undef const in update_const() 
Also clean up the control flow a bit -- move all unqualified
constant handling in one branch.
 2016-07-30 00:37:01 +02:00
Nikita Popov
3b48c5a36f Revert "Make call_user_func() on reference args consistent" 
This reverts commit fafe01b07b.

See bug #72698, there is code using this behavior. Reverting for
PHP 7.0 *only*. The fix is still in PHP 7.1.
 2016-07-28 18:45:44 +02:00
Bob Weinand
dfb3e270c2 Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-07-27 18:18:47 +02:00
Bob Weinand
5513f00a97 Fixed a potential segfault in zend_objects_store_free_object_storage() 
Under the special circumstance where a garbage collected objects bucket slot was not reused until the end of the script, we get access into freed memory...
No test added as it usually is valgrind-only, and only sometimes when the memory happens to have changed (i.e. (GC_FLAGS(obj) & IS_OBJ_FREE_CALLED) == 0), it actually *may* segfault
 2016-07-27 18:08:43 +02:00
Bob Weinand
35764e3579 Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-07-23 16:40:02 +02:00
Bob Weinand
6046acf93e Fix ClosedGeneratorException possibly thrown into wrong scope 2016-07-23 16:39:21 +02:00
Nikita Popov
f4d1af7981 Fix build 
Missed this occurrence...
 2016-07-23 00:12:11 +02:00
Nikita Popov
07af6ba898 Make sure TOKEN_PARSE mode is thread safe 
Introduce an on_event_context passed to the on_event hook. Use this
context to pass along the token array. Previously this was stored
in a non-tls global :/
 2016-07-23 00:00:13 +02:00
Xinchen Hui
5296853fff Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed typo
 2016-07-20 17:01:53 +08:00
Xinchen Hui
cbbe17fb53 Fixed typo 2016-07-20 17:01:42 +08:00
Xinchen Hui
9254f5d5d3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72629 (Caught exception assignment to variables ignores references).

Conflicts:
	main/php_version.h
 2016-07-20 17:00:09 +08:00
Xinchen Hui
97c0b133c5 Fixed bug #72629 (Caught exception assignment to variables ignores references). 2016-07-20 16:59:14 +08:00
Anatol Belski
ab39b094d2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix for bug #72513
 2016-07-19 17:23:51 +02:00
Stanislav Malyshev
374ae8e9da Fix for bug #72513 
This is applicable to 7 as well, but was somehow missing from the merge.
 2016-07-19 17:18:24 +02:00
Nikita Popov
cbba1fff3f Fix leak if get_iterator throws but doesn't return NULL 2016-07-16 23:16:34 +02:00
Nikita Popov
0242845536 Merge branch 'PHP-7.0' 2016-07-16 23:03:01 +02:00
Nikita Popov
31cbe23a9a Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_gc.c
 2016-07-16 23:02:34 +02:00
Nikita Popov
171c759d79 Revert "Fixed bug #72286 (Segmentation fault During Garbage Collection)" 
This reverts commit 1c84b55ade.
 2016-07-16 23:02:23 +02:00
Nikita Popov
664e5f392d Merge branch 'PHP-7.0' 2016-07-14 21:41:49 +02:00
Nikita Popov
a50a5c1bf1 Fix is_callable() on abstract method via object 2016-07-14 21:41:41 +02:00
Dmitry Stogov
92e158e3c4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72286 (Segmentation fault During Garbage Collection)
 2016-07-14 22:39:15 +03:00
Dmitry Stogov
99a5170781 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #72286 (Segmentation fault During Garbage Collection)
 2016-07-14 22:38:47 +03:00
Dmitry Stogov
1c84b55ade Fixed bug #72286 (Segmentation fault During Garbage Collection) 2016-07-14 22:37:25 +03:00
Nikita Popov
a26748d7be Fix bad merge 
In master the operand is fetched earlier, I didn't account for
that.
 2016-07-14 20:44:36 +02:00
Nikita Popov
37a2f3fe25 Fix leak if get_constructor returns NULL 2016-07-14 18:42:46 +02:00
Nikita Popov
eba5466f10 Fix leaks if update_constant fails 2016-07-14 18:42:45 +02:00
Nikita Popov
0bda0422af Merge branch 'PHP-7.0' 
Conflicts:
	Zend/zend_vm_execute.h
 2016-07-14 18:39:48 +02:00
Nikita Popov
00047fcf84 Fix leak when dynamically calling abstract method 2016-07-14 18:39:08 +02:00
Nikita Popov
587668be56 Fix leak of class name when printing exception backtrace 2016-07-14 18:38:58 +02:00
Nikita Popov
c3804a2cf9 Fix leaks in yield from error conditions 
Conflicts:
	Zend/zend_vm_execute.h
 2016-07-14 18:38:45 +02:00
Nikita Popov
d1f82bfeb2 Fix leak for by-ref assign to overloaded object 
Conflicts:
	Zend/zend_vm_execute.h
 2016-07-14 18:38:04 +02:00
Nikita Popov
82ce2a4e4d Add missing call opcodes in cleanup_unfinished_calls() 
Otherwise we may leak if an exception is thrown from them.
 2016-07-14 18:37:28 +02:00
Nikita Popov
5063b5aea1 Fix leak if throw_exception_object() fails 2016-07-14 18:37:21 +02:00
Nikita Popov
e3e400c983 Fix return from by-ref generators 2016-07-14 15:44:04 +02:00
Dmitry Stogov
9a76189caf Fixed memory leak 2016-07-14 13:14:15 +03:00
Dmitry Stogov
f80bb059b3 Fixed memory leak 2016-07-14 13:05:27 +03:00
Dmitry Stogov
8fc934b0a1 Fixed bug #71818 (Memory leak when array altered in destructor) 2016-07-14 12:05:44 +03:00
Xinchen Hui
efdc8ccd52 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72594 (Calling an earlier instance of an included anonymous class fatals)

Conflicts:
	Zend/zend_compile.c
 2016-07-14 13:38:27 +08:00
Xinchen Hui
8c5b27e061 Fixed bug #72594 (Calling an earlier instance of an included anonymous class fatals) 2016-07-14 13:36:43 +08:00
Dmitry Stogov
e6f04d4c8e Unified behavior of modification of returned by reference value in finnally code. 2016-07-13 20:35:53 +03:00
Dmitry Stogov
02dca0cf16 Removed wrong warning 2016-07-13 20:04:47 +03:00
Dmitry Stogov
afd3e39d66 Fixed bug #29368 (The destructor is called when an exception is thrown from the constructor). 2016-07-13 16:43:47 +03:00
Dmitry Stogov
3b8cb2119b Fixed bug #72347 (VERIFY_RETURN type casts visible in finally) 
Fixed bug #72216 (Return by reference with finally is not memory safe)
Fixed bug #72215 (Wrong return value if var modified in finally)
 2016-07-13 15:08:28 +03:00
Bob Weinand
7a125a4409 Remove bogus zend_signal_shutdown symbol from header 2016-07-13 01:05:32 +02:00