mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-8.3'
* PHP-8.3: Fix GH-12392: Segmentation fault on SoapClient::__getTypes Fix GH-11121: ReflectionFiber segfault [ci skip] NEWS
This commit is contained in:
Niels Dossche
commit
0ba24a5ed9
6 changed files with 231 additions and 7 deletions
|
|
@ -656,6 +656,10 @@ static zend_always_inline zend_fiber_transfer zend_fiber_resume(zend_fiber *fibe
|
|||
{
|
||||
zend_fiber *previous = EG(active_fiber);
|
||||
|
||||
if (previous) {
|
||||
previous->execute_data = EG(current_execute_data);
|
||||
}
|
||||
|
||||
fiber->caller = EG(current_fiber_context);
|
||||
EG(active_fiber) = fiber;
|
||||
|
||||
|
|
@ -673,6 +677,7 @@ static zend_always_inline zend_fiber_transfer zend_fiber_suspend(zend_fiber *fib
|
|||
zend_fiber_context *caller = fiber->caller;
|
||||
fiber->previous = EG(current_fiber_context);
|
||||
fiber->caller = NULL;
|
||||
fiber->execute_data = EG(current_execute_data);
|
||||
|
||||
return zend_fiber_switch_to(caller, value, false);
|
||||
}
|
||||
|
|
@ -851,7 +856,6 @@ ZEND_METHOD(Fiber, suspend)
|
|||
|
||||
ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_RUNNING || fiber->context.status == ZEND_FIBER_STATUS_SUSPENDED);
|
||||
|
||||
fiber->execute_data = EG(current_execute_data);
|
||||
fiber->stack_bottom->prev_execute_data = NULL;
|
||||
|
||||
zend_fiber_transfer transfer = zend_fiber_suspend(fiber, value);
|
||||
|
|
|
|||
62
ext/reflection/tests/ReflectionFiber_bug_gh11121_1.phpt
Normal file
62
ext/reflection/tests/ReflectionFiber_bug_gh11121_1.phpt
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
--TEST--
|
||||
GH-11121: Segfault when using ReflectionFiber
|
||||
--FILE--
|
||||
<?php
|
||||
function f() {
|
||||
Fiber::suspend();
|
||||
}
|
||||
|
||||
function g() {
|
||||
(new Fiber(function() {
|
||||
global $f;
|
||||
var_dump((new ReflectionFiber($f))->getTrace());
|
||||
}))->start();
|
||||
}
|
||||
|
||||
$f = new Fiber(function() { f(); max(...[1,2,3,4,5,6,7,8,9,10,11,12]); g(); });
|
||||
$f->start();
|
||||
$f->resume();
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(7) {
|
||||
["file"]=>
|
||||
string(%d) "%sReflectionFiber_bug_gh11121_1.php"
|
||||
["line"]=>
|
||||
int(10)
|
||||
["function"]=>
|
||||
string(5) "start"
|
||||
["class"]=>
|
||||
string(5) "Fiber"
|
||||
["object"]=>
|
||||
object(Fiber)#3 (0) {
|
||||
}
|
||||
["type"]=>
|
||||
string(2) "->"
|
||||
["args"]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
[1]=>
|
||||
array(4) {
|
||||
["file"]=>
|
||||
string(%d) "%sReflectionFiber_bug_gh11121_1.php"
|
||||
["line"]=>
|
||||
int(13)
|
||||
["function"]=>
|
||||
string(1) "g"
|
||||
["args"]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
[2]=>
|
||||
array(2) {
|
||||
["function"]=>
|
||||
string(9) "{closure}"
|
||||
["args"]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
}
|
||||
63
ext/reflection/tests/ReflectionFiber_bug_gh11121_2.phpt
Normal file
63
ext/reflection/tests/ReflectionFiber_bug_gh11121_2.phpt
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
--TEST--
|
||||
GH-11121: Segfault when using ReflectionFiber
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
function f() {
|
||||
Fiber::suspend();
|
||||
}
|
||||
|
||||
function g() {
|
||||
(new Fiber(function() {
|
||||
global $f;
|
||||
var_dump((new ReflectionFiber($f))->getTrace());
|
||||
}))->start();
|
||||
}
|
||||
|
||||
$f = new Fiber(function() { f(); g(); });
|
||||
$f->start();
|
||||
$f->resume();
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(7) {
|
||||
["file"]=>
|
||||
string(%d) "%sReflectionFiber_bug_gh11121_2.php"
|
||||
["line"]=>
|
||||
int(11)
|
||||
["function"]=>
|
||||
string(5) "start"
|
||||
["class"]=>
|
||||
string(5) "Fiber"
|
||||
["object"]=>
|
||||
object(Fiber)#3 (0) {
|
||||
}
|
||||
["type"]=>
|
||||
string(2) "->"
|
||||
["args"]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
[1]=>
|
||||
array(4) {
|
||||
["file"]=>
|
||||
string(%d) "%sReflectionFiber_bug_gh11121_2.php"
|
||||
["line"]=>
|
||||
int(14)
|
||||
["function"]=>
|
||||
string(1) "g"
|
||||
["args"]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
[2]=>
|
||||
array(2) {
|
||||
["function"]=>
|
||||
string(9) "{closure}"
|
||||
["args"]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2261,17 +2261,23 @@ static void schema_type_fixup(sdlCtx *ctx, sdlTypePtr type)
|
|||
schema_content_model_fixup(ctx, type->model);
|
||||
}
|
||||
if (type->attributes) {
|
||||
zend_string *str_key;
|
||||
zend_ulong index;
|
||||
HashPosition pos;
|
||||
zend_hash_internal_pointer_reset_ex(type->attributes, &pos);
|
||||
|
||||
ZEND_HASH_FOREACH_KEY_PTR(type->attributes, index, str_key, attr) {
|
||||
if (str_key) {
|
||||
while ((attr = zend_hash_get_current_data_ptr_ex(type->attributes, &pos)) != NULL) {
|
||||
zend_string *str_key;
|
||||
zend_ulong index;
|
||||
|
||||
if (zend_hash_get_current_key_ex(type->attributes, &str_key, &index, &pos) == HASH_KEY_IS_STRING) {
|
||||
schema_attribute_fixup(ctx, attr);
|
||||
zend_result result = zend_hash_move_forward_ex(type->attributes, &pos);
|
||||
ZEND_ASSERT(result == SUCCESS);
|
||||
} else {
|
||||
schema_attributegroup_fixup(ctx, attr, type->attributes);
|
||||
zend_hash_index_del(type->attributes, index);
|
||||
zend_result result = zend_hash_index_del(type->attributes, index);
|
||||
ZEND_ASSERT(result == SUCCESS);
|
||||
}
|
||||
} ZEND_HASH_FOREACH_END();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
28
ext/soap/tests/gh12392.phpt
Normal file
28
ext/soap/tests/gh12392.phpt
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
--TEST--
|
||||
GH-12392 (Segmentation fault on SoapClient::__getTypes)
|
||||
--EXTENSIONS--
|
||||
soap
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$client = new SoapClient(__DIR__ . "/gh12392.wsdl", ['cache_wsdl' => WSDL_CACHE_NONE]);
|
||||
echo 'Client created!' . "\n";
|
||||
|
||||
$types = $client->__getTypes();
|
||||
echo 'Got types!' . "\n";
|
||||
|
||||
var_dump($types);
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
Client created!
|
||||
Got types!
|
||||
array(1) {
|
||||
[0]=>
|
||||
string(62) "struct dummy {
|
||||
string foo;
|
||||
string a;
|
||||
string b;
|
||||
string c;
|
||||
}"
|
||||
}
|
||||
61
ext/soap/tests/gh12392.wsdl
Normal file
61
ext/soap/tests/gh12392.wsdl
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<wsdl:definitions
|
||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
|
||||
xmlns="http://schemas.xmlsoap.org/wsdl/"
|
||||
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
|
||||
targetNamespace="http://xoev.de/schemata/xzufi/2_2_0">
|
||||
<wsdl:types>
|
||||
<xs:schema xmlns:ns="http://php.net" targetNamespace="http://php.net">
|
||||
<xs:attributeGroup name="c">
|
||||
<xs:attribute name="c" type="string" />
|
||||
</xs:attributeGroup>
|
||||
|
||||
<xs:attributeGroup name="b">
|
||||
<xs:attribute name="b" type="string" />
|
||||
</xs:attributeGroup>
|
||||
|
||||
<xs:attributeGroup name="a">
|
||||
<xs:attribute name="a" type="string" />
|
||||
<xs:attributeGroup ref="ns:b" />
|
||||
</xs:attributeGroup>
|
||||
|
||||
<xs:complexType name="dummy">
|
||||
<xs:sequence>
|
||||
<xs:element name="foo" type="string" />
|
||||
</xs:sequence>
|
||||
<xs:attributeGroup ref="ns:a" />
|
||||
<xs:attributeGroup ref="ns:c" />
|
||||
</xs:complexType>
|
||||
</xs:schema>
|
||||
</wsdl:types>
|
||||
|
||||
<!-- Below is a shortened copy of the test.wsdl, doesn't matter, only the types matter -->
|
||||
|
||||
<message name="AddRequest">
|
||||
<part name="x" type="xs:double" />
|
||||
</message>
|
||||
|
||||
<portType name="TestServicePortType">
|
||||
<operation name="Add">
|
||||
<input message="tns:AddRequest" />
|
||||
</operation>
|
||||
</portType>
|
||||
|
||||
<binding name="TestServiceBinding" type="tns:TestServicePortType">
|
||||
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
|
||||
<operation name="Add">
|
||||
<soap:operation soapAction="Add" style="rpc" />
|
||||
<input>
|
||||
<soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
|
||||
</input>
|
||||
</operation>
|
||||
</binding>
|
||||
|
||||
<service name="TestService">
|
||||
<port name="TestServicePort" binding="tns:TestServiceBinding">
|
||||
<soap:address location="http://linuxsrv.home/~dmitry/soap/soap_server.php" />
|
||||
</port>
|
||||
</service>
|
||||
|
||||
</wsdl:definitions>
|
||||
Loading…
Add table
Add a link
Reference in a new issue