felipe Fri Feb 6 10:20:09 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings bug47322.phpt
Modified files:
/php-src/ext/standard scanf.c
Log:
- MFH: Fixed bug #47322 (sscanf %d does't work)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/scanf.c?r1=1.31.2.2.2.5.2.4&r2=1.31.2.2.2.5.2.5&diff_format=u
Index: php-src/ext/standard/scanf.c
diff -u php-src/ext/standard/scanf.c:1.31.2.2.2.5.2.4
php-src/ext/standard/scanf.c:1.31.2.2.2.5.2.5
--- php-src/ext/standard/scanf.c:1.31.2.2.2.5.2.4 Mon Jan 19 09:52:24 2009
+++ php-src/ext/standard/scanf.c Fri Feb 6 10:20:09 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: scanf.c,v 1.31.2.2.2.5.2.4 2009/01/19 09:52:24 tony2001 Exp $ */
+/* $Id: scanf.c,v 1.31.2.2.2.5.2.5 2009/02/06 10:20:09 felipe Exp $ */
/*
scanf.c --
@@ -1078,7 +1078,7 @@
} else if (numVars) {
current =
args[objIndex++];
zval_dtor(*current);
- Z_LVAL(**current) =
value;
+ ZVAL_LONG(*current,
value);
} else {
add_index_long(*return_value, objIndex++, value);
}
@@ -1183,7 +1183,7 @@
} else if (numVars) {
current = args[objIndex++];
zval_dtor(*current);
- Z_DVAL_PP( current ) = dvalue;
+ ZVAL_DOUBLE(*current, dvalue);
} else {
add_index_double(
*return_value, objIndex++, dvalue );
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug47322.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/strings/bug47322.phpt
+++ php-src/ext/standard/tests/strings/bug47322.phpt
--TEST--
Bug #47322 (sscanf %d does't work)
--FILE--
<?php
sscanf("15:59:58.2","%d:%d:%f", $a, $b, $c);
echo "[$a][$b][$c]\n";
sscanf("15:59:58.2","%d:%d:%f", $a, $b, $c);
echo "[$a][$b][$c]\n";
sscanf("15:59:foo","%d:%d:%s", $a, $b, $c);
echo "[$a][$b][$c]\n";
?>
--EXPECT--
[15][59][58.2]
[15][59][58.2]
[15][59][foo]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
