iliaa Sun Oct 28 13:47:15 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests bug42976.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
/php-src NEWS
Log:
MFB: Fixed bug #42976 (Crash when constructor for newInstance() or
newInstanceArgs() fails)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.46&r2=1.164.2.33.2.47&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.46
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.47
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.46 Thu Sep 27
09:15:20 2007
+++ php-src/ext/reflection/php_reflection.c Sun Oct 28 13:47:14 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.46 2007/09/27 09:15:20 tony2001 Exp $
*/
+/* $Id: php_reflection.c,v 1.164.2.33.2.47 2007/10/28 13:47:14 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3405,7 +3405,7 @@
Returns an instance of this class */
ZEND_METHOD(reflection_class, newInstance)
{
- zval *retval_ptr;
+ zval *retval_ptr = NULL;
reflection_object *intern;
zend_class_entry *ce;
int argc = ZEND_NUM_ARGS();
@@ -3449,7 +3449,9 @@
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
efree(params);
- zval_ptr_dtor(&retval_ptr);
+ if (retval_ptr) {
+ zval_ptr_dtor(&retval_ptr);
+ }
zend_error(E_WARNING, "Invocation of %s's constructor
failed", ce->name);
RETURN_NULL();
}
@@ -3469,7 +3471,7 @@
Returns an instance of this class */
ZEND_METHOD(reflection_class, newInstanceArgs)
{
- zval *retval_ptr;
+ zval *retval_ptr = NULL;
reflection_object *intern;
zend_class_entry *ce;
int argc = 0;
@@ -3524,7 +3526,9 @@
if (params) {
efree(params);
}
- zval_ptr_dtor(&retval_ptr);
+ if (retval_ptr) {
+ zval_ptr_dtor(&retval_ptr);
+ }
zend_error(E_WARNING, "Invocation of %s's constructor
failed", ce->name);
RETURN_NULL();
}
@@ -4903,7 +4907,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.46 2007/09/27 09:15:20 tony2001 Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.47 2007/10/28 13:47:14 iliaa Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.989&r2=1.2027.2.547.2.990&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.989 php-src/NEWS:1.2027.2.547.2.990
--- php-src/NEWS:1.2027.2.547.2.989 Fri Oct 26 17:45:26 2007
+++ php-src/NEWS Sun Oct 28 13:47:14 2007
@@ -44,6 +44,8 @@
(Ilia)
- Fixed bug #43020 (Warning message is missing with shuffle() and more
than one argument). (Scott)
+- Fixed bug #42976 (Crash when constructor for newInstance() or
+ newInstanceArgs() fails) (Ilia)
- Fixed bug #42943 (ext/mssql: Move *timeout initialization from RINIT
to connect time). (Ilia)
- Fixed bug #42917 (PDO::FETCH_KEY_PAIR doesn't work with setFetchMode).
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug42976.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/bug42976.phpt
+++ php-src/ext/reflection/tests/bug42976.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
