archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2'

Browse source 
* PHP-7.2:
  Fix #76643: Segmentation fault when using `output_add_rewrite_var`
This commit is contained in:
Christoph M. Becker 2018-07-24 12:33:08 +02:00
commit dcd6a6ff36
4 changed files with 60 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -5,6 +5,8 @@ PHP NEWS
- Standard: - Standard:
. Fixed bug #68553 (array_column: null values in $index_key become incrementing . Fixed bug #68553 (array_column: null values in $index_key become incrementing
keys in result). (Laruence) keys in result). (Laruence)
. Fixed bug #76643 (Segmentation fault when using `output_add_rewrite_var`).
(cmb)
19 Jul 2018, PHP 7.3.0alpha4 19 Jul 2018, PHP 7.3.0alpha4

12
ext/standard/tests/general_functions/bug76643.phpt Normal file
View file

@ -0,0 +1,12 @@
--TEST--
Bug #76643 (Segmentation fault when using `output_add_rewrite_var`)
--FILE--
<?php
$_SERVER = 'foo';
output_add_rewrite_var('bar', 'baz');
?>
<form action="http://example.com/"></form>
===DONE===
--EXPECT--
<form action="http://example.com/"></form>
===DONE===

89
ext/standard/url_scanner_ex.c
View file

@ -356,6 +356,7 @@ static int check_http_host(char *target)
char *colon; char *colon;
if ((tmp = zend_hash_str_find(&EG(symbol_table), ZEND_STRL("_SERVER"))) && if ((tmp = zend_hash_str_find(&EG(symbol_table), ZEND_STRL("_SERVER"))) &&
Z_TYPE_P(tmp) == IS_ARRAY &&
(host = zend_hash_str_find(Z_ARRVAL_P(tmp), ZEND_STRL("HTTP_HOST"))) && (host = zend_hash_str_find(Z_ARRVAL_P(tmp), ZEND_STRL("HTTP_HOST"))) &&
Z_TYPE_P(host) == IS_STRING) { Z_TYPE_P(host) == IS_STRING) {
host_tmp = zend_string_init(Z_STRVAL_P(host), Z_STRLEN_P(host), 0); host_tmp = zend_string_init(Z_STRVAL_P(host), Z_STRLEN_P(host), 0);
@ -521,7 +522,7 @@ state_plain_begin:
state_plain: state_plain:
start = YYCURSOR; start = YYCURSOR;
#line 525 "ext/standard/url_scanner_ex.c" #line 526 "ext/standard/url_scanner_ex.c"
{ {
YYCTYPE yych; YYCTYPE yych;
static const unsigned char yybm[] = { static const unsigned char yybm[] = {
@ -571,22 +572,22 @@ yy2:
if (yybm[0+yych] & 128) { if (yybm[0+yych] & 128) {
goto yy2; goto yy2;
} }
#line 528 "ext/standard/url_scanner_ex.re" #line 529 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain; } { passthru(STD_ARGS); goto state_plain; }
#line 577 "ext/standard/url_scanner_ex.c" #line 578 "ext/standard/url_scanner_ex.c"
yy5: yy5:
++YYCURSOR; ++YYCURSOR;
#line 527 "ext/standard/url_scanner_ex.re" #line 528 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; } { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
#line 582 "ext/standard/url_scanner_ex.c" #line 583 "ext/standard/url_scanner_ex.c"
} }
#line 529 "ext/standard/url_scanner_ex.re" #line 530 "ext/standard/url_scanner_ex.re"
state_tag: state_tag:
start = YYCURSOR; start = YYCURSOR;
#line 590 "ext/standard/url_scanner_ex.c" #line 591 "ext/standard/url_scanner_ex.c"
{ {
YYCTYPE yych; YYCTYPE yych;
static const unsigned char yybm[] = { static const unsigned char yybm[] = {
@ -629,9 +630,9 @@ state_tag:
goto yy11; goto yy11;
} }
++YYCURSOR; ++YYCURSOR;
#line 535 "ext/standard/url_scanner_ex.re" #line 536 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain_begin; } { passthru(STD_ARGS); goto state_plain_begin; }
#line 635 "ext/standard/url_scanner_ex.c" #line 636 "ext/standard/url_scanner_ex.c"
yy11: yy11:
++YYCURSOR; ++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1); if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -639,11 +640,11 @@ yy11:
if (yybm[0+yych] & 128) { if (yybm[0+yych] & 128) {
goto yy11; goto yy11;
} }
#line 534 "ext/standard/url_scanner_ex.re" #line 535 "ext/standard/url_scanner_ex.re"
{ handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; } { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
#line 645 "ext/standard/url_scanner_ex.c" #line 646 "ext/standard/url_scanner_ex.c"
} }
#line 536 "ext/standard/url_scanner_ex.re" #line 537 "ext/standard/url_scanner_ex.re"
state_next_arg_begin: state_next_arg_begin:
@ -652,7 +653,7 @@ state_next_arg_begin:
state_next_arg: state_next_arg:
start = YYCURSOR; start = YYCURSOR;
#line 656 "ext/standard/url_scanner_ex.c" #line 657 "ext/standard/url_scanner_ex.c"
{ {
YYCTYPE yych; YYCTYPE yych;
static const unsigned char yybm[] = { static const unsigned char yybm[] = {
@ -708,9 +709,9 @@ state_next_arg:
yy16: yy16:
++YYCURSOR; ++YYCURSOR;
yy17: yy17:
#line 547 "ext/standard/url_scanner_ex.re" #line 548 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain_begin; } { passthru(STD_ARGS); goto state_plain_begin; }
#line 714 "ext/standard/url_scanner_ex.c" #line 715 "ext/standard/url_scanner_ex.c"
yy18: yy18:
++YYCURSOR; ++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1); if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -718,30 +719,30 @@ yy18:
if (yybm[0+yych] & 128) { if (yybm[0+yych] & 128) {
goto yy18; goto yy18;
} }
#line 545 "ext/standard/url_scanner_ex.re" #line 546 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_next_arg; } { passthru(STD_ARGS); goto state_next_arg; }
#line 724 "ext/standard/url_scanner_ex.c" #line 725 "ext/standard/url_scanner_ex.c"
yy21: yy21:
yych = *++YYCURSOR; yych = *++YYCURSOR;
if (yych != '>') goto yy17; if (yych != '>') goto yy17;
yy22: yy22:
++YYCURSOR; ++YYCURSOR;
#line 544 "ext/standard/url_scanner_ex.re" #line 545 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; } { passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
#line 732 "ext/standard/url_scanner_ex.c" #line 733 "ext/standard/url_scanner_ex.c"
yy24: yy24:
++YYCURSOR; ++YYCURSOR;
#line 546 "ext/standard/url_scanner_ex.re" #line 547 "ext/standard/url_scanner_ex.re"
{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; } { --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
#line 737 "ext/standard/url_scanner_ex.c" #line 738 "ext/standard/url_scanner_ex.c"
} }
#line 548 "ext/standard/url_scanner_ex.re" #line 549 "ext/standard/url_scanner_ex.re"
state_arg: state_arg:
start = YYCURSOR; start = YYCURSOR;
#line 745 "ext/standard/url_scanner_ex.c" #line 746 "ext/standard/url_scanner_ex.c"
{ {
YYCTYPE yych; YYCTYPE yych;
static const unsigned char yybm[] = { static const unsigned char yybm[] = {
@ -786,9 +787,9 @@ state_arg:
if (yych <= 'z') goto yy30; if (yych <= 'z') goto yy30;
yy28: yy28:
++YYCURSOR; ++YYCURSOR;
#line 554 "ext/standard/url_scanner_ex.re" #line 555 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; } { passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
#line 792 "ext/standard/url_scanner_ex.c" #line 793 "ext/standard/url_scanner_ex.c"
yy30: yy30:
++YYCURSOR; ++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1); if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -796,17 +797,17 @@ yy30:
if (yybm[0+yych] & 128) { if (yybm[0+yych] & 128) {
goto yy30; goto yy30;
} }
#line 553 "ext/standard/url_scanner_ex.re" #line 554 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; } { passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
#line 802 "ext/standard/url_scanner_ex.c" #line 803 "ext/standard/url_scanner_ex.c"
} }
#line 555 "ext/standard/url_scanner_ex.re" #line 556 "ext/standard/url_scanner_ex.re"
state_before_val: state_before_val:
start = YYCURSOR; start = YYCURSOR;
#line 810 "ext/standard/url_scanner_ex.c" #line 811 "ext/standard/url_scanner_ex.c"
{ {
YYCTYPE yych; YYCTYPE yych;
static const unsigned char yybm[] = { static const unsigned char yybm[] = {
@ -849,9 +850,9 @@ state_before_val:
if (yych == '=') goto yy38; if (yych == '=') goto yy38;
++YYCURSOR; ++YYCURSOR;
yy36: yy36:
#line 561 "ext/standard/url_scanner_ex.re" #line 562 "ext/standard/url_scanner_ex.re"
{ --YYCURSOR; goto state_next_arg_begin; } { --YYCURSOR; goto state_next_arg_begin; }
#line 855 "ext/standard/url_scanner_ex.c" #line 856 "ext/standard/url_scanner_ex.c"
yy37: yy37:
yych = *(YYMARKER = ++YYCURSOR); yych = *(YYMARKER = ++YYCURSOR);
if (yych == ' ') goto yy41; if (yych == ' ') goto yy41;
@ -863,9 +864,9 @@ yy38:
if (yybm[0+yych] & 128) { if (yybm[0+yych] & 128) {
goto yy38; goto yy38;
} }
#line 560 "ext/standard/url_scanner_ex.re" #line 561 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; } { passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
#line 869 "ext/standard/url_scanner_ex.c" #line 870 "ext/standard/url_scanner_ex.c"
yy41: yy41:
++YYCURSOR; ++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1); if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -875,14 +876,14 @@ yy41:
YYCURSOR = YYMARKER; YYCURSOR = YYMARKER;
goto yy36; goto yy36;
} }
#line 562 "ext/standard/url_scanner_ex.re" #line 563 "ext/standard/url_scanner_ex.re"
state_val: state_val:
start = YYCURSOR; start = YYCURSOR;
#line 886 "ext/standard/url_scanner_ex.c" #line 887 "ext/standard/url_scanner_ex.c"
{ {
YYCTYPE yych; YYCTYPE yych;
static const unsigned char yybm[] = { static const unsigned char yybm[] = {
@ -935,15 +936,15 @@ yy46:
if (yybm[0+yych] & 32) { if (yybm[0+yych] & 32) {
goto yy46; goto yy46;
} }
#line 570 "ext/standard/url_scanner_ex.re" #line 571 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; } { handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
#line 941 "ext/standard/url_scanner_ex.c" #line 942 "ext/standard/url_scanner_ex.c"
yy49: yy49:
++YYCURSOR; ++YYCURSOR;
yy50: yy50:
#line 571 "ext/standard/url_scanner_ex.re" #line 572 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_next_arg_begin; } { passthru(STD_ARGS); goto state_next_arg_begin; }
#line 947 "ext/standard/url_scanner_ex.c" #line 948 "ext/standard/url_scanner_ex.c"
yy51: yy51:
yych = *(YYMARKER = ++YYCURSOR); yych = *(YYMARKER = ++YYCURSOR);
if (yych == '>') goto yy50; if (yych == '>') goto yy50;
@ -966,9 +967,9 @@ yy55:
goto yy50; goto yy50;
yy56: yy56:
++YYCURSOR; ++YYCURSOR;
#line 568 "ext/standard/url_scanner_ex.re" #line 569 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; } { handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
#line 972 "ext/standard/url_scanner_ex.c" #line 973 "ext/standard/url_scanner_ex.c"
yy58: yy58:
++YYCURSOR; ++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1); if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -979,11 +980,11 @@ yy59:
} }
if (yych >= '(') goto yy55; if (yych >= '(') goto yy55;
++YYCURSOR; ++YYCURSOR;
#line 569 "ext/standard/url_scanner_ex.re" #line 570 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; } { handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
#line 985 "ext/standard/url_scanner_ex.c" #line 986 "ext/standard/url_scanner_ex.c"
} }
#line 572 "ext/standard/url_scanner_ex.re" #line 573 "ext/standard/url_scanner_ex.re"
stop: stop:

1
ext/standard/url_scanner_ex.re
View file

@ -359,6 +359,7 @@ static int check_http_host(char *target)
char *colon; char *colon;
if ((tmp = zend_hash_str_find(&EG(symbol_table), ZEND_STRL("_SERVER"))) && if ((tmp = zend_hash_str_find(&EG(symbol_table), ZEND_STRL("_SERVER"))) &&
Z_TYPE_P(tmp) == IS_ARRAY &&
(host = zend_hash_str_find(Z_ARRVAL_P(tmp), ZEND_STRL("HTTP_HOST"))) && (host = zend_hash_str_find(Z_ARRVAL_P(tmp), ZEND_STRL("HTTP_HOST"))) &&
Z_TYPE_P(host) == IS_STRING) { Z_TYPE_P(host) == IS_STRING) {
host_tmp = zend_string_init(Z_STRVAL_P(host), Z_STRLEN_P(host), 0); host_tmp = zend_string_init(Z_STRVAL_P(host), Z_STRLEN_P(host), 0);