From: Moriyoshi Koizumi Date: Sat, 18 Jan 2003 18:31:13 +0000 (+0000) Subject: Fixed bug #21726 and #21730 X-Git-Tag: PHP_5_0_dev_before_13561_fix~154 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21b449995336d7030fcfcefc4545a9ddc248f5e6;p=php Fixed bug #21726 and #21730 --- diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c index b1277379a3..9983ecb721 100644 --- a/ext/standard/scanf.c +++ b/ext/standard/scanf.c @@ -762,9 +762,9 @@ PHPAPI int php_sscanf_internal( char *string, char *format, case 'n': if (!(flags & SCAN_SUPPRESS)) { if (numVars) { - current = args[objIndex++]; - convert_to_long( *current ); - ZVAL_STRINGL( *current, string, end-string, 1); + current = args[objIndex++]; + zval_dtor( *current ); + ZVAL_LONG( *current, (long)(string - baseString) ); } else { add_index_long(*return_value, objIndex++, string - baseString); } @@ -883,8 +883,8 @@ PHPAPI int php_sscanf_internal( char *string, char *format, if (!(flags & SCAN_SUPPRESS)) { if (numVars) { current = args[objIndex++]; - convert_to_string( *current ); - ZVAL_STRINGL( *current, string, end-string, 1); + zval_dtor( *current ); + ZVAL_STRINGL( *current, string, end-string, 1); } else { add_index_stringl( *return_value, objIndex++, string, end-string, 1); }