Fixed possible crash because of uninitialized value (Zdash Urf)

This commit is contained in:
Dmitry Stogov 2007-10-17 12:09:14 +00:00
parent e61f2d2ad3
commit a098b7ead4
2 changed files with 68 additions and 0 deletions

View file

@ -1135,6 +1135,7 @@ static zval* get_zval_property(zval* object, char* name TSRMLS_DC)
zval *data;
zend_class_entry *old_scope;
INIT_PZVAL(&member);
ZVAL_STRING(&member, name, 0);
old_scope = EG(scope);
EG(scope) = Z_OBJCE_P(object);
@ -1169,6 +1170,7 @@ static void unset_zval_property(zval* object, char* name TSRMLS_DC)
zval member;
zend_class_entry *old_scope;
INIT_PZVAL(&member);
ZVAL_STRING(&member, name, 0);
old_scope = EG(scope);
EG(scope) = Z_OBJCE_P(object);

66
ext/soap/tests/classmap004.phpt Executable file
View 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
)
)