From 16670b2d42ba94a2c269245d249c5b350fab723a Mon Sep 17 00:00:00 2001 From: Moriyoshi Koizumi Date: Sat, 18 Jan 2003 21:20:47 +0000 Subject: [PATCH] MFH: fixed bug #21726 and #21730 --- ext/standard/scanf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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); } -- 2.40.0