mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: Fixed bug #46238 (Segmentation fault on static call with empty string method)

Browse Source
This commit is contained in:
Felipe Pena 2008-10-06 00:40:02 +00:00
parent 46aad39ee2
commit e68106988a
4 changed files with 144 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -13,6 +13,8 @@ PHP NEWS
- Fixed bug causing the algorithm parameter of mhash() to be modified. (Scott)
- Fixed bug #46238 (Segmentation fault on static call with empty string method).
(Felipe)
- Fixed bug #46206 (pg_query_params/pg_execute convert passed values to
strings). (Ilia)
- Fixed bug #46205 (Closure - Memory leaks when ReflectionException is thrown).

120
Zend/tests/bug46238.phpt Normal file
View File

@ -0,0 +1,120 @@
--TEST--
Bug #46238 (Segmentation fault on static call with empty string method)
--FILE--
<?php
class a {
static function __callStatic($name, $arguments)
{
var_dump(array($name, $arguments));
}
}
$a = 'a';
$b = '';
$a::$b($a);
$a::$b(array());
$a::$b(NULL);
$a::$b(1);
$a::$b();
$b = "\0";
$a::$b($a);
$a::$b(array());
$a::$b(NULL);
$a::$b(1);
$a::$b();
?>
--EXPECT--
array(2) {
[0]=>
string(0) ""
[1]=>
array(1) {
[0]=>
string(1) "a"
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(1) {
[0]=>
array(0) {
}
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(1) {
[0]=>
NULL
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(1) {
[0]=>
int(1)
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(0) {
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(1) {
[0]=>
string(1) "a"
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(1) {
[0]=>
array(0) {
}
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(1) {
[0]=>
NULL
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(1) {
[0]=>
int(1)
}
}
array(2) {
[0]=>
string(0) ""
[1]=>
array(0) {
}
}

4
Zend/zend_vm_def.h
View File

@ -1983,7 +1983,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS
}
}
if(OP2_TYPE != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
zend_free_op free_op2;
@ -2001,7 +2001,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {

40
Zend/zend_vm_execute.h
View File

@ -2630,7 +2630,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
}
}
if(IS_CONST != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
@ -2648,7 +2648,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -3226,7 +3226,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE
}
}
if(IS_TMP_VAR != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
zend_free_op free_op2;
@ -3244,7 +3244,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -3702,7 +3702,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE
}
}
if(IS_VAR != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
zend_free_op free_op2;
@ -3720,7 +3720,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -3934,7 +3934,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
}
}
if(IS_UNUSED != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
@ -3952,7 +3952,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -4378,7 +4378,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
}
}
if(IS_CV != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
@ -4396,7 +4396,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -10371,7 +10371,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
}
}
if(IS_CONST != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
@ -10389,7 +10389,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -12225,7 +12225,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND
}
}
if(IS_TMP_VAR != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
zend_free_op free_op2;
@ -12243,7 +12243,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -14059,7 +14059,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND
}
}
if(IS_VAR != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
zend_free_op free_op2;
@ -14077,7 +14077,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -14986,7 +14986,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
}
}
if(IS_UNUSED != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
@ -15004,7 +15004,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {
@ -16507,7 +16507,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
}
}
if(IS_CV != IS_UNUSED) {
char *function_name_strval;
char *function_name_strval = NULL;
int function_name_strlen = 0;
@ -16525,7 +16525,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
}
}
if (function_name_strlen) {
if (function_name_strval) {
if (ce->get_static_method) {
EX(fbc) = ce->get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
} else {