cvs: php-src(PHP_5_2) / NEWS /ext/standard scanf.c /ext/standard/tests/strings bug47322.phpt

felipe Fri Feb 6 10:22:34 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings bug47322.phpt Modified files: /php-src NEWS /php-src/ext/standard scanf.c Log: - MFH: Fixed bug #47322 (sscanf %d does't work) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1409&r2=1.2027.2.547.2.1410&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1409 php-src/NEWS:1.2027.2.547.2.1410 --- php-src/NEWS:1.2027.2.547.2.1409 Fri Feb 6 08:49:05 2009 +++ php-src/NEWS Fri Feb 6 10:22:34 2009 @@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Feb 2009, PHP 5.2.9 +- Fixed bug #47322 (sscanf %d does't work). (Felipe) 02 Feb 2009, PHP 5.2.9RC1 - Changed __call() to be invoked on private/protected method access, similar to http://cvs.php.net/viewvc.cgi/php-src/ext/standard/scanf.c?r1=1.31.2.2.2.8&r2=1.31.2.2.2.9&diff_format=u Index: php-src/ext/standard/scanf.c diff -u php-src/ext/standard/scanf.c:1.31.2.2.2.8 php-src/ext/standard/scanf.c:1.31.2.2.2.9 --- php-src/ext/standard/scanf.c:1.31.2.2.2.8 Mon Jan 19 14:41:52 2009 +++ php-src/ext/standard/scanf.c Fri Feb 6 10:22:34 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: scanf.c,v 1.31.2.2.2.8 2009/01/19 14:41:52 tony2001 Exp $ */ +/* $Id: scanf.c,v 1.31.2.2.2.9 2009/02/06 10:22:34 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]