Braces in JSON Source by ihumanable · Pull Request #6 · php/php-src

ihumanable · 2012-03-19T22:31:55Z

Adding some braces per coding standards.

timw4mail · 2012-03-19T22:44:17Z

👍

dsp · 2012-03-20T09:20:23Z

If you change the commit message I will merge it.

marfillaster · 2012-03-20T10:01:33Z

git rebase origin/master -i
git push upstream master -f

derickr · 2012-03-20T10:12:56Z

It should also be merged to PHP 5.4... (and perhaps PHP 5.3) please keep the source the same!

rmccue · 2012-03-20T10:20:46Z

@dsp Changing the commit message would require a forced push, which is a bad idea to do for any public repository, so it's not something that should be recommended.

dsp · 2012-03-20T10:24:17Z

(1) he can always create a new branch, cherry pick, modify the commit message, push redo the pull request (2) if you forked just to create a pull request i personally think it doesnt matter to much to push forced to a repo. Obviously we wont push forced to main repositories. (3) git.git itself does rewind the pu branch from time to time using force pushes.

marfillaster · 2012-03-20T10:25:03Z

@rmccue not necessarily. as long as the push has been rebased and nothing has been merge yet into php/php-src. without force, another pull request will be required

rmccue · 2012-03-20T10:26:59Z

@dsp True on the new branch, but forcing a push is a bad idea. If someone pulled in the branch to test, it will ruin their local repository if a forced push has been done.

@marfillaster I disagree, as soon as it's publicly available, you should never force push.

twe4ked · 2012-03-20T10:53:21Z

@rmccue It won't "ruin their local repository" it will just break their local version of this branch, they will be able to simply remove the branch.

ihumanable · 2012-03-20T16:07:16Z

Will reopen with proper commit message

String size refactor take 2 ext/standard last wave

The following opcodes would be generated: ... BB1: 0003 JMP BB3 BB2: 0004 INIT_FCALL 1 96 string("chr") 0005 #10.T3 [long] = SR #3.CV0($int) [long] #7.CV2($i) ... 0006 #11.T4 [long] RANGE[0..127] = BW_AND #10.T3 [long] ... 0007 #12.T3 [long] RANGE[128..255] = BW_OR #11.T4 [long] ... 0008 SEND_VAL #12.T3 [long] RANGE[128..255] 1 0009 #13.V3 [ref, rc1, rcn, any] = DO_ICALL 0010 ASSIGN_OP (CONCAT) #6.CV1($out) [rc1, rcn, string] 0011 ADD #7.CV2($i)... int(7) #7.CV2($i) ... -> #15.CV2($i) ... BB3: 0012 #8.T4 [long] = SR #3.CV0($int) #7.CV2($i) [long, double] 0013 #9.T3 [bool] RANGE[0..1] = IS_SMALLER int(128) #8.T4 0014 JMPNZ #9.T3 [bool] RANGE[0..1] BB2 ... Main changes are: 1. SR opcode covers new path in function zend_jit_long_math_helper(). 2. BW_AND and BW_OR opcodes are supported. See macro LONG_OP. 3. Function zend_jit_concat_helper() is added to support ASSIGN_OP opcode. Speficically, CONCAT and FAST_CONCAT is supported for statements "$out .= ...". 4. New path is covered in function zend_jit_cmp_long_long() by IS_SMALLER opcode. 5. New path is covered in macros ZVAL_PTR_DTOR and ZVAL_DTOR_FUNC when leaving.

…reset The code tries to read the context on NULL when `php_stream_xport_crypto_setup` fails because by then `stream` is reset to NULL. This is also UB, so can cause miscompiles. ``` ==1217==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000090 (pc 0x55d829ed3acf bp 0x7fff045f5770 sp 0x7fff045f4df0 T0) ==1217==The signal is caused by a READ memory access. ==1217==Hint: address points to the zero page. #0 0x55d829ed3acf in php_stream_url_wrap_http_ex /work/php-src/ext/standard/http_fopen_wrapper.c:580 #1 0x55d829ed857e in php_stream_url_wrap_http /work/php-src/ext/standard/http_fopen_wrapper.c:1204 #2 0x55d82a15073d in _php_stream_open_wrapper_ex /work/php-src/main/streams/streams.c:2270 #3 0x55d829e78fa6 in zif_file_get_contents /work/php-src/ext/standard/file.c:409 #4 0x55d829bbfe39 in zif_phar_file_get_contents /work/php-src/ext/phar/func_interceptors.c:226 #5 0x55d82a0b7ed2 in zend_test_execute_internal /work/php-src/ext/zend_test/observer.c:306 #6 0x55d82a3e024a in ZEND_DO_FCALL_SPEC_RETVAL_USED_HANDLER /work/php-src/Zend/zend_vm_execute.h:2154 #7 0x55d82a540995 in execute_ex /work/php-src/Zend/zend_vm_execute.h:116519 #8 0x55d82a5558b0 in zend_execute /work/php-src/Zend/zend_vm_execute.h:121962 #9 0x55d82a6ba0ab in zend_execute_script /work/php-src/Zend/zend.c:1980 #10 0x55d82a0ec8bb in php_execute_script_ex /work/php-src/main/main.c:2645 #11 0x55d82a0ecccb in php_execute_script /work/php-src/main/main.c:2685 #12 0x55d82a6bfc16 in do_cli /work/php-src/sapi/cli/php_cli.c:951 #13 0x55d82a6c21e3 in main /work/php-src/sapi/cli/php_cli.c:1362 #14 0x7f9e770491c9 (/lib/x86_64-linux-gnu/libc.so.6+0x2a1c9) (BuildId: 274eec488d230825a136fa9c4d85370fed7a0a5e) #15 0x7f9e7704928a in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x2a28a) (BuildId: 274eec488d230825a136fa9c4d85370fed7a0a5e) #16 0x55d829209b34 in _start (/work/php-src/build-dbg-asan/sapi/cli/php+0x609b34) (BuildId: aa149f943514fff0c491e1f199e30fed0e977f7c) ``` This is a backport of: * 7782b88 * f9519cc * afded3d Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com>

…reset The code tries to read the context on NULL when `php_stream_xport_crypto_setup` fails because by then `stream` is reset to NULL. This is also UB, so can cause miscompiles. ``` ==1217==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000090 (pc 0x55d829ed3acf bp 0x7fff045f5770 sp 0x7fff045f4df0 T0) ==1217==The signal is caused by a READ memory access. ==1217==Hint: address points to the zero page. #0 0x55d829ed3acf in php_stream_url_wrap_http_ex /work/php-src/ext/standard/http_fopen_wrapper.c:580 php#1 0x55d829ed857e in php_stream_url_wrap_http /work/php-src/ext/standard/http_fopen_wrapper.c:1204 php#2 0x55d82a15073d in _php_stream_open_wrapper_ex /work/php-src/main/streams/streams.c:2270 php#3 0x55d829e78fa6 in zif_file_get_contents /work/php-src/ext/standard/file.c:409 php#4 0x55d829bbfe39 in zif_phar_file_get_contents /work/php-src/ext/phar/func_interceptors.c:226 php#5 0x55d82a0b7ed2 in zend_test_execute_internal /work/php-src/ext/zend_test/observer.c:306 php#6 0x55d82a3e024a in ZEND_DO_FCALL_SPEC_RETVAL_USED_HANDLER /work/php-src/Zend/zend_vm_execute.h:2154 php#7 0x55d82a540995 in execute_ex /work/php-src/Zend/zend_vm_execute.h:116519 php#8 0x55d82a5558b0 in zend_execute /work/php-src/Zend/zend_vm_execute.h:121962 php#9 0x55d82a6ba0ab in zend_execute_script /work/php-src/Zend/zend.c:1980 php#10 0x55d82a0ec8bb in php_execute_script_ex /work/php-src/main/main.c:2645 php#11 0x55d82a0ecccb in php_execute_script /work/php-src/main/main.c:2685 php#12 0x55d82a6bfc16 in do_cli /work/php-src/sapi/cli/php_cli.c:951 php#13 0x55d82a6c21e3 in main /work/php-src/sapi/cli/php_cli.c:1362 php#14 0x7f9e770491c9 (/lib/x86_64-linux-gnu/libc.so.6+0x2a1c9) (BuildId: 274eec488d230825a136fa9c4d85370fed7a0a5e) php#15 0x7f9e7704928a in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x2a28a) (BuildId: 274eec488d230825a136fa9c4d85370fed7a0a5e) php#16 0x55d829209b34 in _start (/work/php-src/build-dbg-asan/sapi/cli/php+0x609b34) (BuildId: aa149f943514fff0c491e1f199e30fed0e977f7c) ``` This is a backport of: * 7782b88 * f9519cc * afded3d Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com>

php_fsockopen_stream() called zend_argument_value_error(6, ...) for the $timeout parameter, but $timeout is the 5th argument. This caused the error message to show "Argument php#6" with no parameter name, since get_function_arg_name() returns NULL when arg_num exceeds the actual argument count. Reproduce: fsockopen('localhost', 80, $err, $errstr, -2.0); // Before: ValueError: fsockopen(): Argument php#6 must be -1 or between... // After: ValueError: fsockopen(): Argument php#5 ($timeout) must be -1...

php_fsockopen_stream() called zend_argument_value_error(6, ...) for the $timeout parameter, but $timeout is the 5th argument. This caused the error message to show "Argument php#6" with no parameter name, since get_function_arg_name() returns NULL when arg_num exceeds the actual argument count. The format string also contained ZEND_ULONG_FMT (which expects a zend_ulong) but received a double expression, causing undefined behavior. This is fixed by casting to zend_ulong before the call.

Adding some braces, braces are win

1ba55bc

ihumanable and others added 2 commits March 20, 2012 09:05

Adding Braces in json.c to conform with coding standards

8c66258

Merge branch 'master' of github.com:ihumanable/php-src

3bcec16

ihumanable closed this Mar 20, 2012

cpriest mentioned this pull request Nov 10, 2012

Accessors: SIGSEGV on basic usage cpriest/php-src#3

Closed

Draal mentioned this pull request Apr 7, 2013

Exif crash on unknown encoding was fixed #293

Closed

weltling pushed a commit to weltling/php-src that referenced this pull request Sep 11, 2013

Merge pull request php#6 from weltling/string_size_refactor_take_2

ef960ef

String size refactor take 2 ext/standard last wave

php-pulls pushed a commit that referenced this pull request Dec 20, 2013

readline support #6

33f0502

dstogov referenced this pull request Apr 17, 2015

Added GC checks and improvements

276080e

GXhua mentioned this pull request Jul 31, 2020

Update zend_execute_API.c #5911

Closed

AlexeyZamorov mentioned this pull request Aug 26, 2021

Update interface.c #7376

Closed

dstogov referenced this pull request Sep 2, 2021

JIT: Better code for ADD/SUB/MUL and references in tracing JIT.

7690fa0

dstogov referenced this pull request Nov 19, 2021

Fixed date/diff where the difference in hour is less than 1

e4679ef

derickr mentioned this pull request Jan 3, 2022

Segfaults with PHP 7.4.27 fpm and mysqlnd driver #7877

Closed

This was referenced Jul 21, 2026

Bucket brigade UAF #22845

Open

StreamPollHandle UAF #22844

Open

lacatoire mentioned this pull request Aug 17, 2026

Fix wrong argument number in fsockopen/pfsockopen timeout error lacatoire/php-src#1905

Closed

Navigation Menu

Uh oh!

Braces in JSON Source - #6

Braces in JSON Source#6
ihumanable wants to merge 3 commits into
php:masterfrom
ihumanable:master

ihumanable commented Mar 19, 2012

Uh oh!

timw4mail commented Mar 19, 2012

Uh oh!

dsp commented Mar 20, 2012

Uh oh!

marfillaster commented Mar 20, 2012

Uh oh!

derickr commented Mar 20, 2012

Uh oh!

rmccue commented Mar 20, 2012

Uh oh!

dsp commented Mar 20, 2012

Uh oh!

marfillaster commented Mar 20, 2012

Uh oh!

rmccue commented Mar 20, 2012

Uh oh!

twe4ked commented Mar 20, 2012

Uh oh!

ihumanable commented Mar 20, 2012

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

ihumanable commented Mar 19, 2012

Uh oh!

timw4mail commented Mar 19, 2012

Uh oh!

dsp commented Mar 20, 2012

Uh oh!

marfillaster commented Mar 20, 2012

Uh oh!

derickr commented Mar 20, 2012

Uh oh!

rmccue commented Mar 20, 2012

Uh oh!

dsp commented Mar 20, 2012

Uh oh!

marfillaster commented Mar 20, 2012

Uh oh!

rmccue commented Mar 20, 2012

Uh oh!

twe4ked commented Mar 20, 2012

Uh oh!

ihumanable commented Mar 20, 2012

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants