felipe Tue Oct 7 18:23:06 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/interbase/tests bug45575.phpt
Modified files:
/php-src NEWS
/php-src/ext/interbase ibase_events.c
Log:
- MFH: Fixed bug #45575 (Segfault with invalid non-string as event handler
callback)
patch by Christian seiler
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1245&r2=1.2027.2.547.2.1246&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1245 php-src/NEWS:1.2027.2.547.2.1246
--- php-src/NEWS:1.2027.2.547.2.1245 Tue Oct 7 15:31:47 2008
+++ php-src/NEWS Tue Oct 7 18:23:05 2008
@@ -62,6 +62,8 @@
requests). (Moriyoshi)
- Fixed bug #45581 (htmlspecialchars() double encoding &#x hex items). (Arnaud)
- Fixed bug #45580 (levenshtein() crashes with invalid argument). (Ilia)
+- Fixed bug #45575 (Segfault with invalid non-string as event handler
callback).
+ (Christian Seiler)
- Fixed bug #45568 (ISAPI doesn't properly clear auth_digest in header).
(Patch by: navara at emclient dot com)
- Fixed bug #45556 (Return value from callback isn't freed). (Felipe)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_events.c?r1=1.8.2.1.2.3&r2=1.8.2.1.2.4&diff_format=u
Index: php-src/ext/interbase/ibase_events.c
diff -u php-src/ext/interbase/ibase_events.c:1.8.2.1.2.3
php-src/ext/interbase/ibase_events.c:1.8.2.1.2.4
--- php-src/ext/interbase/ibase_events.c:1.8.2.1.2.3 Tue Oct 7 15:31:48 2008
+++ php-src/ext/interbase/ibase_events.c Tue Oct 7 18:23:05 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ibase_events.c,v 1.8.2.1.2.3 2008/10/07 15:31:48 felipe Exp $ */
+/* $Id: ibase_events.c,v 1.8.2.1.2.4 2008/10/07 18:23:05 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -260,7 +260,7 @@
* link resource id (int) as arguments. The value returned from the
function is
* used to determine if the event handler should remain set.
*/
-
+ char *cb_name;
zval **args[17], **cb_arg;
ibase_db_link *ib_link;
ibase_event *event;
@@ -312,11 +312,12 @@
}
/* get the callback */
- if (!zend_is_callable(*cb_arg, 0, NULL)) {
- _php_ibase_module_error("Callback argument %s is not a callable
function"
- TSRMLS_CC, Z_STRVAL_PP(cb_arg));
+ if (!zend_is_callable(*cb_arg, 0, &cb_name)) {
+ _php_ibase_module_error("Callback argument %s is not a callable
function" TSRMLS_CC, cb_name);
+ efree(cb_name);
RETURN_FALSE;
}
+ efree(cb_name);
/* allocate the event resource */
event = (ibase_event *) safe_emalloc(sizeof(ibase_event), 1, 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/bug45575.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/bug45575.phpt
+++ php-src/ext/interbase/tests/bug45575.phpt
--TEST--
Bug #45575 (Segfault with invalid non-string as event handler callback)
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
<?php
require("interbase.inc");
$db = ibase_connect($test_base);
function foobar($var) { var_dump($var); return true; }
ibase_set_event_handler($db, null, 'TEST1');
ibase_set_event_handler($db, 1, 'TEST1');
ibase_set_event_handler('foobar', 'TEST1');
?>
--EXPECTF--
Warning: ibase_set_event_handler(): Callback argument is not a callable
function in %s on line %d
Warning: ibase_set_event_handler(): Callback argument 1 is not a callable
function in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
