mirror of
https://github.com/php/php-src.git
synced 2025-08-20 09:24:05 +02:00
Fixed possible crash because of uninitialized value (Zdash Urf)
This commit is contained in:
parent
e61f2d2ad3
commit
a098b7ead4
2 changed files with 68 additions and 0 deletions
|
@ -1135,6 +1135,7 @@ static zval* get_zval_property(zval* object, char* name TSRMLS_DC)
|
||||||
zval *data;
|
zval *data;
|
||||||
zend_class_entry *old_scope;
|
zend_class_entry *old_scope;
|
||||||
|
|
||||||
|
INIT_PZVAL(&member);
|
||||||
ZVAL_STRING(&member, name, 0);
|
ZVAL_STRING(&member, name, 0);
|
||||||
old_scope = EG(scope);
|
old_scope = EG(scope);
|
||||||
EG(scope) = Z_OBJCE_P(object);
|
EG(scope) = Z_OBJCE_P(object);
|
||||||
|
@ -1169,6 +1170,7 @@ static void unset_zval_property(zval* object, char* name TSRMLS_DC)
|
||||||
zval member;
|
zval member;
|
||||||
zend_class_entry *old_scope;
|
zend_class_entry *old_scope;
|
||||||
|
|
||||||
|
INIT_PZVAL(&member);
|
||||||
ZVAL_STRING(&member, name, 0);
|
ZVAL_STRING(&member, name, 0);
|
||||||
old_scope = EG(scope);
|
old_scope = EG(scope);
|
||||||
EG(scope) = Z_OBJCE_P(object);
|
EG(scope) = Z_OBJCE_P(object);
|
||||||
|
|
66
ext/soap/tests/classmap004.phpt
Executable file
66
ext/soap/tests/classmap004.phpt
Executable file
|
@ -0,0 +1,66 @@
|
||||||
|
--TEST--
|
||||||
|
SOAP Classmap 4: encoding of objects with __get()
|
||||||
|
--SKIPIF--
|
||||||
|
<?php require_once('skipif.inc'); ?>
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
ini_set("soap.wsdl_cache_enabled",0);
|
||||||
|
|
||||||
|
class A {
|
||||||
|
public $a;
|
||||||
|
function __construct($a){
|
||||||
|
$this->x = $a;
|
||||||
|
}
|
||||||
|
function __get($name) {
|
||||||
|
return @$this->a[$name];
|
||||||
|
}
|
||||||
|
function __set($name, $val) {
|
||||||
|
$this->a[$name] = $val;
|
||||||
|
}
|
||||||
|
function __unset($name) {
|
||||||
|
unset($this->a[$name]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class B extends A {
|
||||||
|
function __construct($a){
|
||||||
|
parent::__construct($a);
|
||||||
|
$this->y = $a + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function f(){
|
||||||
|
return new B(5);
|
||||||
|
}
|
||||||
|
|
||||||
|
class LocalSoapClient extends SoapClient {
|
||||||
|
|
||||||
|
function __construct($wsdl, $options) {
|
||||||
|
parent::__construct($wsdl, $options);
|
||||||
|
$this->server = new SoapServer($wsdl, $options);
|
||||||
|
$this->server->addFunction("f");
|
||||||
|
}
|
||||||
|
|
||||||
|
function __doRequest($request, $location, $action, $version) {
|
||||||
|
ob_start();
|
||||||
|
$this->server->handle($request);
|
||||||
|
$response = ob_get_contents();
|
||||||
|
ob_end_clean();
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$client = new LocalSoapClient(dirname(__FILE__)."/classmap003.wsdl",
|
||||||
|
array('classmap'=>array('A'=>'A','B'=>'B')));
|
||||||
|
print_r($client->f());
|
||||||
|
?>
|
||||||
|
--EXPECT--
|
||||||
|
B Object
|
||||||
|
(
|
||||||
|
[a] => Array
|
||||||
|
(
|
||||||
|
[x] => 5
|
||||||
|
[y] => 6
|
||||||
|
)
|
||||||
|
|
||||||
|
)
|
Loading…
Add table
Add a link
Reference in a new issue