php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 16:22:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
91,179 Commits 545 Branches 1,479 Tags
tmp_liveliness
Commit Graph

91179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
f66905dad7 Fix weird asm instruction order with gcc by marking as volatile in phpdbg 2015-07-13 14:11:39 +02:00
Bob Weinand
79e6dba040 Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled 2015-07-13 13:45:27 +02:00
Nikita Popov
a49ce7bb91 Don't return T_ERROR from token_get_all() 
This turned out to be rather inconvenient after all. Instead just
return the same output we did on PHP 5. If people want to have an
error, use TOKEN_PARSE.
 2015-07-09 23:02:21 +02:00
Anatol Belski
fc5c7e633b refix the NEWS 2015-07-09 22:56:11 +02:00
Dmitry Stogov
8c3f701eeb Fixed exception catching on break/continue 
Fixed "finaly" handling on exception in "return" statement
 2015-07-09 23:20:50 +03:00
Nikita Popov
788c4c852d Fix posix_setrlimit segfault 2015-07-09 20:40:07 +02:00
Bob Weinand
cc876c04b4 Fix too early terminated temporary range with break/cont/goto 
I have no crashing or leaking reproduce script, only valgrind invalid reads for that one; hence no phpt here
 2015-07-09 20:07:57 +02:00
Ferenc Kovacs
9591b1cc3c Merge branch 'PHP-5.6' 
* PHP-5.6:
  move the use-after-free fixes to 5.6.11
 2015-07-09 20:02:18 +02:00
Ferenc Kovacs
ab66152c68 move the use-after-free fixes to 5.6.11 2015-07-09 20:01:37 +02:00
Dmitry Stogov
17c5315bdf Fixed exception habdling on "return" statement. 
Such exceptions shouldn't be caught in the same function.
 2015-07-09 20:47:25 +03:00
Nikita Popov
d91aad5966 Fix bug #69430 
Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.
 2015-07-09 19:11:48 +02:00
Nikita Popov
8abc3022b0 Update token_get_all() arginfo 2015-07-09 18:19:12 +02:00
Bob Weinand
f5db5a558d Add test guaranteeing that loop vars are only freed after potential return type exceptions 2015-07-09 16:54:41 +02:00
Dmitry Stogov
54f367ee2a Fixed invalid live-range detection 2015-07-09 17:38:29 +03:00
Dmitry Stogov
b77fa94cf9 Disable opcache.fast_shutdown if USE_ZEND_ALLOC=0 2015-07-09 12:19:51 +03:00
Dmitry Stogov
225bb70498 Added missing API functions 2015-07-09 12:19:30 +03:00
Xinchen Hui
0de0c4ace1 Fixed Bug #70032 (make_http_soap_request calls zend_hash_get_current_key_ex(,,,NULL)) 2015-07-09 16:36:31 +08:00
Magnus Määttä
a55ca9a8d1 Fix posix_setrlimit() to use int as values instead of strings. 
Add constant for unlimited (POSIX_RLIMIT_INFINITY).
 2015-07-09 00:04:13 +02:00
Magnus Määttä
963d906aff Add posix_setrlimit() FR #54603 2015-07-08 22:12:07 +02:00
Dmitry Stogov
301ee26568 Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). 
CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE().
As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
 2015-07-08 18:33:58 +03:00
Julien Pauli
993a658ada Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.5.27 release
 2015-07-08 17:00:47 +02:00
Julien Pauli
b1a9b89773 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.27 release

Conflicts:
	main/php_version.h
 2015-07-08 17:00:29 +02:00
Julien Pauli
34b624f122 5.5.27 release 2015-07-08 16:59:44 +02:00
Bob Weinand
3ccc17cee5 Working fix for ctrl+d on readline/libedit 2015-07-08 16:54:41 +02:00
Xinchen Hui
5460929077 Merge branch 'PHP-5.6' 2015-07-08 22:35:10 +08:00
Xinchen Hui
c75d245e82 Revert "Fixed invalid read" 
I must be confused while switching from master to 5.6

This reverts commit 94957a7091.
 2015-07-08 22:34:27 +08:00
Xinchen Hui
ffccf19fa6 Merge branch 'master' of git.php.net:php-src 2015-07-08 19:31:36 +08:00
Xinchen Hui
da333bfbd8 Fixed bug #70018 (exec does not strip all whitespace) 
Merge branch 'PHP-5.6'

Conflicts:
	ext/standard/exec.c
 2015-07-08 19:30:58 +08:00
Anatol Belski
dd1f0940fe fix NEWS 2015-07-08 13:27:34 +02:00
Xinchen Hui
94957a7091 Fixed invalid read 2015-07-08 19:19:37 +08:00
Xinchen Hui
f9dc60f36f Merge branch 'master' of git.php.net:php-src 2015-07-08 18:25:04 +08:00
Xinchen Hui
b9e48073b3 Make sure fast_call_var is initialized properly 2015-07-08 18:24:27 +08:00
Nikita Popov
ed14019e8c Add assertion in liveliness computation 
Assert that a live-range does not start, while one for the same
variable is already active.

To satisfy this constraint, explicitly exclude writes from JMP_SET
and COALESCE. They were previously also handled correctly, because
their result variable was only killed after the second write to it
after the false branch. This just makes it more explicit.
 2015-07-08 12:00:39 +02:00
Xinchen Hui
249915f938 Add comment to explaining the new check 2015-07-08 17:44:54 +08:00
Xinchen Hui
3b5876916d Remove outdate comment 2015-07-08 17:42:50 +08:00
Xinchen Hui
c6037bd3af Fixed bug #70012 (Exception lost with nested finally block) 2015-07-08 17:15:09 +08:00
Xinchen Hui
6154fc77be Merge branch 'PHP-5.6' 2015-07-08 17:14:32 +08:00
Xinchen Hui
ca30d5bf39 Fixed bug #70012 (Exception lost with nested finally block) 2015-07-08 17:14:19 +08:00
Aaron Piotrowski
1c7619491e Fix failing tests from exception code changes 2015-07-07 23:14:05 -05:00
Kalle Sommer Nielsen
b84363f7fa PHP 7.0.0 Beta 2 NEWS 2015-07-08 02:37:59 +02:00
Nikita Popov
1852f538b9 ZEND_SEPARATE reuses temporaries 2015-07-08 00:13:23 +02:00
Aaron Piotrowski
a1a83bf5f0 Switch code on thrown TypeError and ParseError to 0, update related tests 2015-07-07 16:54:39 -05:00
Christoph M. Becker
dbadf447b2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed typo in test for bug #66985
 2015-07-07 23:39:18 +02:00
Christoph M. Becker
e68b5252a2 fixed typo in test for bug #66985 2015-07-07 23:35:28 +02:00
Bob Weinand
7a8ea0f60d Properly exit on EOF on stdin in readline mode 2015-07-07 22:45:34 +02:00
Nikita Popov
b3a4c05071 Remove loop_var_stack 
Instead add a loop_var member to brk_cont_element. Now that
brk_cont is compile-time the distinction is no longer necessary.

Also drops brk_cont.start, check the loop_var op_type instead.
 2015-07-07 20:55:12 +02:00
Rasmus Lerdorf
40ca0f1927 SQLite3::open/__construct has 2 optional args 2015-07-07 11:53:07 -07:00
Stanislav Malyshev
a5e7075d79 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Better fix for bug #69958
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
	ext/phar/phar_object.c
 2015-07-07 10:19:20 -07:00
Stanislav Malyshev
2d0771d66c Better fix for bug #69958 2015-07-07 10:18:22 -07:00
Stanislav Malyshev
3bee16a70a Better fix for bug #69958 2015-07-07 10:17:54 -07:00