felipe Sun Oct 26 13:48:16 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard streamsfuncs.c
/php-src NEWS
Log:
- MFH: Fixed bug #46388 (stream_notification_callback inside of object
destroys object variables)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.23&r2=1.58.2.6.2.24&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.23
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.24
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.23 Wed Jul 23 11:25:50 2008
+++ php-src/ext/standard/streamsfuncs.c Sun Oct 26 13:48:15 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.23 2008/07/23 11:25:50 tony2001 Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.24 2008/10/26 13:48:15 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -819,12 +819,13 @@
INIT_ZVAL(zvs[i]);
ps[i] = &zvs[i];
ptps[i] = &ps[i];
+ MAKE_STD_ZVAL(ps[i]);
}
ZVAL_LONG(ps[0], notifycode);
ZVAL_LONG(ps[1], severity);
if (xmsg) {
- ZVAL_STRING(ps[2], xmsg, 0);
+ ZVAL_STRING(ps[2], xmsg, 1);
} else {
ZVAL_NULL(ps[2]);
}
@@ -835,6 +836,9 @@
if (FAILURE == call_user_function_ex(EG(function_table), NULL,
callback, &retval, 6, ptps, 0, NULL TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to call
user notifier");
}
+ for (i = 0; i < 6; i++) {
+ zval_ptr_dtor(&ps[i]);
+ }
if (retval) {
zval_ptr_dtor(&retval);
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1280&r2=1.2027.2.547.2.1281&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1280 php-src/NEWS:1.2027.2.547.2.1281
--- php-src/NEWS:1.2027.2.547.2.1280 Sun Oct 26 11:27:06 2008
+++ php-src/NEWS Sun Oct 26 13:48:16 2008
@@ -3,6 +3,8 @@
?? Nov 2008, PHP 5.2.7RC3
- Fixed bug #46389 (NetWare needs small patch for _timezone).
(patch by [EMAIL PROTECTED])
+- Fixed bug #46388 (stream_notification_callback inside of object destroys
+ object variables). (Felipe)
- Fixed bug #46381 (wrong $this passed to internal methods causes segfault).
(Tony)
- Fixed bug #46082 (stream_set_blocking() can cause a crash in some
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
