iliaa Wed Feb 18 14:48:14 2004 EDT
Added files:
/php-src/ext/standard/tests/strings bug27295.phpt
Modified files:
/php-src/ext/standard scanf.c
Log:
Fixed bug #27295 (memory leak inside sscanf()).
http://cvs.php.net/diff.php/php-src/ext/standard/scanf.c?r1=1.28&r2=1.29&ty=u
Index: php-src/ext/standard/scanf.c
diff -u php-src/ext/standard/scanf.c:1.28 php-src/ext/standard/scanf.c:1.29
--- php-src/ext/standard/scanf.c:1.28 Thu Jan 8 03:17:34 2004
+++ php-src/ext/standard/scanf.c Wed Feb 18 14:48:12 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: scanf.c,v 1.28 2004/01/08 08:17:34 andi Exp $ */
+/* $Id: scanf.c,v 1.29 2004/02/18 19:48:12 iliaa Exp $ */
/*
scanf.c --
@@ -933,7 +933,7 @@
if (!(flags & SCAN_SUPPRESS)) {
if (numVars) {
current = args[objIndex++];
- convert_to_string( *current );
+ zval_dtor( *current );
ZVAL_STRINGL( *current, string,
end-string, 1);
} else {
add_index_stringl(*return_value,
objIndex++, string, end-string, 1);
http://cvs.php.net/co.php/php-src/ext/standard/tests/strings/bug27295.phpt?r=1.1&p=1
Index: php-src/ext/standard/tests/strings/bug27295.phpt
+++ php-src/ext/standard/tests/strings/bug27295.phpt
--TEST--
Bug #27295 (memory leak inside sscanf())
--FILE--
<?php
$strings = array("foo = bar", "bar = foo");
foreach( $strings as $string )
{
sscanf( $string, "%s = %[^[]]", $var, $val );
echo "$var = $val\n";
}
?>
--EXPECT--
foo = bar
bar = foo
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
