diff options
| author | Michael Wallner <mike@php.net> | 2010-05-19 11:28:08 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2010-05-19 11:28:08 +0000 |
| commit | 60c236be923e943e0fb8e7dd00353a15207e66f4 (patch) | |
| tree | 6456620120a5b9326db3f5ac2afabda03c1c597f | |
| parent | 0d47dff2871219e900ee41a12d2d32dc3c7d7823 (diff) | |
| download | php-git-60c236be923e943e0fb8e7dd00353a15207e66f4.tar.gz | |
* fixed bug #47842 sscanf() does not support 64-bit values
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/standard/scanf.c | 7 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug47842.phpt | 34 |
3 files changed, 39 insertions, 3 deletions
@@ -171,6 +171,7 @@ PHP NEWS parent dir). (Etienne) - Fixed bug #48289 (iconv_mime_encode() quoted-printable scheme is broken). (Adam, patch from hiroaki dot kawai at gmail dot com). +- Fixed bug #47842 (sscanf() does not support 64-bit values). (Mike) - Fixed bug #46111 (Some timezone identifiers can not be parsed). (Derick) - Fixed bug #43233 (sasl support for ldap on Windows). (Pierre) - Fixed bug #35673 (formatOutput does not work with saveHTML). (Rob) diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c index e6b3f5865b..903fe83479 100644 --- a/ext/standard/scanf.c +++ b/ext/standard/scanf.c @@ -581,7 +581,8 @@ PHPAPI int php_sscanf_internal( char *string, char *format, int varStart, zval **return_value TSRMLS_DC) { int numVars, nconversions, totalVars = -1; - int i, value, result; + int i, result; + long value; int objIndex; char *end, *baseString; zval **current; @@ -1059,9 +1060,9 @@ addToInt: */ if (!(flags & SCAN_SUPPRESS)) { *end = '\0'; - value = (int) (*fn)(buf, NULL, base); + value = (long) (*fn)(buf, NULL, base); if ((flags & SCAN_UNSIGNED) && (value < 0)) { - snprintf(buf, sizeof(buf), "%u", value); /* INTL: ISO digit */ + snprintf(buf, sizeof(buf), "%lu", value); /* INTL: ISO digit */ if (numVars && objIndex >= argCount) { break; } else if (numVars) { diff --git a/ext/standard/tests/strings/bug47842.phpt b/ext/standard/tests/strings/bug47842.phpt new file mode 100644 index 0000000000..4ac9da6d83 --- /dev/null +++ b/ext/standard/tests/strings/bug47842.phpt @@ -0,0 +1,34 @@ +--TEST-- +Bug #47842 sscanf() does not support 64-bit values +--SKIPIF-- +<?php +if (PHP_INT_MAX < pow(2,31)) die("skip PHP_INT_MAX < 32b\n"); +?> +--FILE-- +<?php +echo "-Test\n"; + +sscanf("2147483647", '%d', $int); +echo "sscanf 32-bit signed int '2147483647' (2^31)-1 = ",$int,"\n"; +sscanf("4294967295", '%u', $int); +echo "sscanf 32-bit unsign int '4294967295' (2^32)-1 = ",$int,"\n"; + +sscanf("9223372036854775807", '%d', $int); +echo "sscanf 64-bit signed int '9223372036854775807' (2^63)-1 = ",$int,"\n"; +sscanf("18446744073709551615", '%u', $int); +echo "sscanf 64-bit unsign int '18446744073709551615' (2^64)-1 = ",$int,"\n"; + +printf("printf 64-bit signed int '9223372036854775807' (2^63)-1 = %d\n", 9223372036854775807); +printf("printf 64-bit signed int '18446744073709551615' (2^64)-1 = %u\n", 18446744073709551615); + +echo "Done\n"; +?> +--EXPECTF-- +%aTest +sscanf 32-bit signed int '2147483647' (2^31)-1 = 2147483647 +sscanf 32-bit unsign int '4294967295' (2^32)-1 = 4294967295 +sscanf 64-bit signed int '9223372036854775807' (2^63)-1 = 9223372036854775807 +sscanf 64-bit unsign int '18446744073709551615' (2^64)-1 = 18446744073709551615 +printf 64-bit signed int '9223372036854775807' (2^63)-1 = 9223372036854775807 +printf 64-bit signed int '18446744073709551615' (2^64)-1 = 0 +Done |