diff options
| author | Maciej W. Rozycki <macro@redhat.com> | 2025-03-28 12:35:53 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@redhat.com> | 2025-03-28 12:35:53 +0000 |
| commit | e78cb4f6bd033b09eaf316057598df9315891860 (patch) | |
| tree | 5bd950535a238ed8106fc8288e76cdb8f02c8644 /stdio-common | |
| parent | a26638424ffea604f7ef94d0c6f3940304698442 (diff) | |
| download | glibc-e78cb4f6bd033b09eaf316057598df9315891860.tar.xz glibc-e78cb4f6bd033b09eaf316057598df9315891860.zip | |
stdio-common: Reject integer prefixes in scanf [BZ #12701]
Reject invalid formatted scanf integer input data that is comprised of a
binary or hexadecimal prefix, optionally preceded by a sign, and with no
actual digits following. Such data is a prefix of, but not a matching
input sequence and it is required by ISO C to cause a matching failure.
Currently a matching success is instead incorrectly produced along with
the conversion result of zero, with the prefix wholly consumed from
input.
Enable input data that causes test failures without this fix in place.
Reviewed-by: Joseph Myers <josmyers@redhat.com>
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/tst-scanf-format-char-i.input | 384 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-llong-i.input | 192 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-short-i.input | 192 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-uchar-b.input | 168 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-uchar-x.input | 168 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-uchar-xx.input | 168 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-ullong-b.input | 96 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-ullong-x.input | 96 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-ullong-xx.input | 96 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-ushort-b.input | 96 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-ushort-x.input | 96 | ||||
| -rw-r--r-- | stdio-common/tst-scanf-format-ushort-xx.input | 96 | ||||
| -rw-r--r-- | stdio-common/vfscanf-internal.c | 36 |
13 files changed, 947 insertions, 937 deletions
diff --git a/stdio-common/tst-scanf-format-char-i.input b/stdio-common/tst-scanf-format-char-i.input index 31f7ff0508..0855f5059e 100644 --- a/stdio-common/tst-scanf-format-char-i.input +++ b/stdio-common/tst-scanf-format-char-i.input @@ -510,76 +510,76 @@ %*2hhi:-0b0:0:2: %2hhi:0:1:1:0: %*2hhi:0:0:1: -# BZ12701 %2hhi:0X0:0:-1: -# BZ12701 %*2hhi:0X0:0:-1: -# BZ12701 %2hhi:0x0:0:-1: -# BZ12701 %*2hhi:0x0:0:-1: +%2hhi:0X0:0:-1: +%*2hhi:0X0:0:-1: +%2hhi:0x0:0:-1: +%*2hhi:0x0:0:-1: %2hhi:00:1:2:0: %*2hhi:00:0:2: -# BZ12701 %2hhi:0B0:0:-1: -# BZ12701 %*2hhi:0B0:0:-1: -# BZ12701 %2hhi:0b0:0:-1: -# BZ12701 %*2hhi:0b0:0:-1: +%2hhi:0B0:0:-1: +%*2hhi:0B0:0:-1: +%2hhi:0b0:0:-1: +%*2hhi:0b0:0:-1: %2hhi:1:1:1:1: %*2hhi:1:0:1: -# BZ12701 %2hhi:0X1:0:-1: -# BZ12701 %*2hhi:0X1:0:-1: -# BZ12701 %2hhi:0x1:0:-1: -# BZ12701 %*2hhi:0x1:0:-1: +%2hhi:0X1:0:-1: +%*2hhi:0X1:0:-1: +%2hhi:0x1:0:-1: +%*2hhi:0x1:0:-1: %2hhi:01:1:2:1: %*2hhi:01:0:2: -# BZ12701 %2hhi:0B1:0:-1: -# BZ12701 %*2hhi:0B1:0:-1: -# BZ12701 %2hhi:0b1:0:-1: -# BZ12701 %*2hhi:0b1:0:-1: +%2hhi:0B1:0:-1: +%*2hhi:0B1:0:-1: +%2hhi:0b1:0:-1: +%*2hhi:0b1:0:-1: %2hhi:42:1:2:42: %*2hhi:42:0:2: -# BZ12701 %2hhi:0X2a:0:-1: -# BZ12701 %*2hhi:0X2a:0:-1: -# BZ12701 %2hhi:0x2A:0:-1: -# BZ12701 %*2hhi:0x2A:0:-1: +%2hhi:0X2a:0:-1: +%*2hhi:0X2a:0:-1: +%2hhi:0x2A:0:-1: +%*2hhi:0x2A:0:-1: %2hhi:052:1:2:5: %*2hhi:052:0:2: -# BZ12701 %2hhi:0B101010:0:-1: -# BZ12701 %*2hhi:0B101010:0:-1: -# BZ12701 %2hhi:0b101010:0:-1: -# BZ12701 %*2hhi:0b101010:0:-1: +%2hhi:0B101010:0:-1: +%*2hhi:0B101010:0:-1: +%2hhi:0b101010:0:-1: +%*2hhi:0b101010:0:-1: %2hhi:127:1:2:12: %*2hhi:127:0:2: -# BZ12701 %2hhi:0X7f:0:-1: -# BZ12701 %*2hhi:0X7f:0:-1: -# BZ12701 %2hhi:0x7F:0:-1: -# BZ12701 %*2hhi:0x7F:0:-1: +%2hhi:0X7f:0:-1: +%*2hhi:0X7f:0:-1: +%2hhi:0x7F:0:-1: +%*2hhi:0x7F:0:-1: %2hhi:0177:1:2:1: %*2hhi:0177:0:2: -# BZ12701 %2hhi:0B1111111:0:-1: -# BZ12701 %*2hhi:0B1111111:0:-1: -# BZ12701 %2hhi:0b1111111:0:-1: -# BZ12701 %*2hhi:0b1111111:0:-1: +%2hhi:0B1111111:0:-1: +%*2hhi:0B1111111:0:-1: +%2hhi:0b1111111:0:-1: +%*2hhi:0b1111111:0:-1: %2hhi:128:1:2:12: %*2hhi:128:0:2: -# BZ12701 %2hhi:0X80:0:-1: -# BZ12701 %*2hhi:0X80:0:-1: -# BZ12701 %2hhi:0x80:0:-1: -# BZ12701 %*2hhi:0x80:0:-1: +%2hhi:0X80:0:-1: +%*2hhi:0X80:0:-1: +%2hhi:0x80:0:-1: +%*2hhi:0x80:0:-1: %2hhi:0200:1:2:2: %*2hhi:0200:0:2: -# BZ12701 %2hhi:0B10000000:0:-1: -# BZ12701 %*2hhi:0B10000000:0:-1: -# BZ12701 %2hhi:0b10000000:0:-1: -# BZ12701 %*2hhi:0b10000000:0:-1: +%2hhi:0B10000000:0:-1: +%*2hhi:0B10000000:0:-1: +%2hhi:0b10000000:0:-1: +%*2hhi:0b10000000:0:-1: %2hhi:169:1:2:16: %*2hhi:169:0:2: -# BZ12701 %2hhi:0Xa9:0:-1: -# BZ12701 %*2hhi:0Xa9:0:-1: -# BZ12701 %2hhi:0xA9:0:-1: -# BZ12701 %*2hhi:0xA9:0:-1: +%2hhi:0Xa9:0:-1: +%*2hhi:0Xa9:0:-1: +%2hhi:0xA9:0:-1: +%*2hhi:0xA9:0:-1: %2hhi:0251:1:2:2: %*2hhi:0251:0:2: -# BZ12701 %2hhi:0B10101001:0:-1: -# BZ12701 %*2hhi:0B10101001:0:-1: -# BZ12701 %2hhi:0b10101001:0:-1: -# BZ12701 %*2hhi:0b10101001:0:-1: +%2hhi:0B10101001:0:-1: +%*2hhi:0B10101001:0:-1: +%2hhi:0b10101001:0:-1: +%*2hhi:0b10101001:0:-1: %2hhi:+0:1:2:0: %*2hhi:+0:0:2: %2hhi:+0X0:1:2:0: @@ -656,76 +656,76 @@ %*3hhi::0:-1: %3hhi:-251:1:3:-25: %*3hhi:-251:0:3: -# BZ12701 %3hhi:-0Xfb:0:-1: -# BZ12701 %*3hhi:-0Xfb:0:-1: -# BZ12701 %3hhi:-0xFB:0:-1: -# BZ12701 %*3hhi:-0xFB:0:-1: +%3hhi:-0Xfb:0:-1: +%*3hhi:-0Xfb:0:-1: +%3hhi:-0xFB:0:-1: +%*3hhi:-0xFB:0:-1: %3hhi:-0373:1:3:-3: %*3hhi:-0373:0:3: -# BZ12701 %3hhi:-0B11111011:0:-1: -# BZ12701 %*3hhi:-0B11111011:0:-1: -# BZ12701 %3hhi:-0b11111011:0:-1: -# BZ12701 %*3hhi:-0b11111011:0:-1: +%3hhi:-0B11111011:0:-1: +%*3hhi:-0B11111011:0:-1: +%3hhi:-0b11111011:0:-1: +%*3hhi:-0b11111011:0:-1: %3hhi:-129:1:3:-12: %*3hhi:-129:0:3: -# BZ12701 %3hhi:-0X81:0:-1: -# BZ12701 %*3hhi:-0X81:0:-1: -# BZ12701 %3hhi:-0x81:0:-1: -# BZ12701 %*3hhi:-0x81:0:-1: +%3hhi:-0X81:0:-1: +%*3hhi:-0X81:0:-1: +%3hhi:-0x81:0:-1: +%*3hhi:-0x81:0:-1: %3hhi:-0201:1:3:-2: %*3hhi:-0201:0:3: -# BZ12701 %3hhi:-0B10000001:0:-1: -# BZ12701 %*3hhi:-0B10000001:0:-1: -# BZ12701 %3hhi:-0b10000001:0:-1: -# BZ12701 %*3hhi:-0b10000001:0:-1: +%3hhi:-0B10000001:0:-1: +%*3hhi:-0B10000001:0:-1: +%3hhi:-0b10000001:0:-1: +%*3hhi:-0b10000001:0:-1: %3hhi:-128:1:3:-12: %*3hhi:-128:0:3: -# BZ12701 %3hhi:-0X80:0:-1: -# BZ12701 %*3hhi:-0X80:0:-1: -# BZ12701 %3hhi:-0x80:0:-1: -# BZ12701 %*3hhi:-0x80:0:-1: +%3hhi:-0X80:0:-1: +%*3hhi:-0X80:0:-1: +%3hhi:-0x80:0:-1: +%*3hhi:-0x80:0:-1: %3hhi:-0200:1:3:-2: %*3hhi:-0200:0:3: -# BZ12701 %3hhi:-0B10000000:0:-1: -# BZ12701 %*3hhi:-0B10000000:0:-1: -# BZ12701 %3hhi:-0b10000000:0:-1: -# BZ12701 %*3hhi:-0b10000000:0:-1: +%3hhi:-0B10000000:0:-1: +%*3hhi:-0B10000000:0:-1: +%3hhi:-0b10000000:0:-1: +%*3hhi:-0b10000000:0:-1: %3hhi:-123:1:3:-12: %*3hhi:-123:0:3: -# BZ12701 %3hhi:-0X7b:0:-1: -# BZ12701 %*3hhi:-0X7b:0:-1: -# BZ12701 %3hhi:-0x7B:0:-1: -# BZ12701 %*3hhi:-0x7B:0:-1: +%3hhi:-0X7b:0:-1: +%*3hhi:-0X7b:0:-1: +%3hhi:-0x7B:0:-1: +%*3hhi:-0x7B:0:-1: %3hhi:-0173:1:3:-1: %*3hhi:-0173:0:3: -# BZ12701 %3hhi:-0B1111011:0:-1: -# BZ12701 %*3hhi:-0B1111011:0:-1: -# BZ12701 %3hhi:-0b1111011:0:-1: -# BZ12701 %*3hhi:-0b1111011:0:-1: +%3hhi:-0B1111011:0:-1: +%*3hhi:-0B1111011:0:-1: +%3hhi:-0b1111011:0:-1: +%*3hhi:-0b1111011:0:-1: %3hhi:-1:1:2:-1: %*3hhi:-1:0:2: -# BZ12701 %3hhi:-0X1:0:-1: -# BZ12701 %*3hhi:-0X1:0:-1: -# BZ12701 %3hhi:-0x1:0:-1: -# BZ12701 %*3hhi:-0x1:0:-1: +%3hhi:-0X1:0:-1: +%*3hhi:-0X1:0:-1: +%3hhi:-0x1:0:-1: +%*3hhi:-0x1:0:-1: %3hhi:-01:1:3:-1: %*3hhi:-01:0:3: -# BZ12701 %3hhi:-0B1:0:-1: -# BZ12701 %*3hhi:-0B1:0:-1: -# BZ12701 %3hhi:-0b1:0:-1: -# BZ12701 %*3hhi:-0b1:0:-1: +%3hhi:-0B1:0:-1: +%*3hhi:-0B1:0:-1: +%3hhi:-0b1:0:-1: +%*3hhi:-0b1:0:-1: %3hhi:-0:1:2:0: %*3hhi:-0:0:2: -# BZ12701 %3hhi:-0X0:0:-1: -# BZ12701 %*3hhi:-0X0:0:-1: -# BZ12701 %3hhi:-0x0:0:-1: -# BZ12701 %*3hhi:-0x0:0:-1: +%3hhi:-0X0:0:-1: +%*3hhi:-0X0:0:-1: +%3hhi:-0x0:0:-1: +%*3hhi:-0x0:0:-1: %3hhi:-00:1:3:0: %*3hhi:-00:0:3: -# BZ12701 %3hhi:-0B0:0:-1: -# BZ12701 %*3hhi:-0B0:0:-1: -# BZ12701 %3hhi:-0b0:0:-1: -# BZ12701 %*3hhi:-0b0:0:-1: +%3hhi:-0B0:0:-1: +%*3hhi:-0B0:0:-1: +%3hhi:-0b0:0:-1: +%*3hhi:-0b0:0:-1: %3hhi:0:1:1:0: %*3hhi:0:0:1: %3hhi:0X0:1:3:0: @@ -800,76 +800,76 @@ %*3hhi:0b10101001:0:3: %3hhi:+0:1:2:0: %*3hhi:+0:0:2: -# BZ12701 %3hhi:+0X0:0:-1: -# BZ12701 %*3hhi:+0X0:0:-1: -# BZ12701 %3hhi:+0x0:0:-1: -# BZ12701 %*3hhi:+0x0:0:-1: +%3hhi:+0X0:0:-1: +%*3hhi:+0X0:0:-1: +%3hhi:+0x0:0:-1: +%*3hhi:+0x0:0:-1: %3hhi:+00:1:3:0: %*3hhi:+00:0:3: -# BZ12701 %3hhi:+0B0:0:-1: -# BZ12701 %*3hhi:+0B0:0:-1: -# BZ12701 %3hhi:+0b0:0:-1: -# BZ12701 %*3hhi:+0b0:0:-1: +%3hhi:+0B0:0:-1: +%*3hhi:+0B0:0:-1: +%3hhi:+0b0:0:-1: +%*3hhi:+0b0:0:-1: %3hhi:+1:1:2:1: %*3hhi:+1:0:2: -# BZ12701 %3hhi:+0X1:0:-1: -# BZ12701 %*3hhi:+0X1:0:-1: -# BZ12701 %3hhi:+0x1:0:-1: -# BZ12701 %*3hhi:+0x1:0:-1: +%3hhi:+0X1:0:-1: +%*3hhi:+0X1:0:-1: +%3hhi:+0x1:0:-1: +%*3hhi:+0x1:0:-1: %3hhi:+01:1:3:1: %*3hhi:+01:0:3: -# BZ12701 %3hhi:+0B1:0:-1: -# BZ12701 %*3hhi:+0B1:0:-1: -# BZ12701 %3hhi:+0b1:0:-1: -# BZ12701 %*3hhi:+0b1:0:-1: +%3hhi:+0B1:0:-1: +%*3hhi:+0B1:0:-1: +%3hhi:+0b1:0:-1: +%*3hhi:+0b1:0:-1: %3hhi:+42:1:3:42: %*3hhi:+42:0:3: -# BZ12701 %3hhi:+0X2a:0:-1: -# BZ12701 %*3hhi:+0X2a:0:-1: -# BZ12701 %3hhi:+0x2A:0:-1: -# BZ12701 %*3hhi:+0x2A:0:-1: +%3hhi:+0X2a:0:-1: +%*3hhi:+0X2a:0:-1: +%3hhi:+0x2A:0:-1: +%*3hhi:+0x2A:0:-1: %3hhi:+052:1:3:5: %*3hhi:+052:0:3: -# BZ12701 %3hhi:+0B101010:0:-1: -# BZ12701 %*3hhi:+0B101010:0:-1: -# BZ12701 %3hhi:+0b101010:0:-1: -# BZ12701 %*3hhi:+0b101010:0:-1: +%3hhi:+0B101010:0:-1: +%*3hhi:+0B101010:0:-1: +%3hhi:+0b101010:0:-1: +%*3hhi:+0b101010:0:-1: %3hhi:+127:1:3:12: %*3hhi:+127:0:3: -# BZ12701 %3hhi:+0X7f:0:-1: -# BZ12701 %*3hhi:+0X7f:0:-1: -# BZ12701 %3hhi:+0x7F:0:-1: -# BZ12701 %*3hhi:+0x7F:0:-1: +%3hhi:+0X7f:0:-1: +%*3hhi:+0X7f:0:-1: +%3hhi:+0x7F:0:-1: +%*3hhi:+0x7F:0:-1: %3hhi:+0177:1:3:1: %*3hhi:+0177:0:3: -# BZ12701 %3hhi:+0B1111111:0:-1: -# BZ12701 %*3hhi:+0B1111111:0:-1: -# BZ12701 %3hhi:+0b1111111:0:-1: -# BZ12701 %*3hhi:+0b1111111:0:-1: +%3hhi:+0B1111111:0:-1: +%*3hhi:+0B1111111:0:-1: +%3hhi:+0b1111111:0:-1: +%*3hhi:+0b1111111:0:-1: %3hhi:+128:1:3:12: %*3hhi:+128:0:3: -# BZ12701 %3hhi:+0X80:0:-1: -# BZ12701 %*3hhi:+0X80:0:-1: -# BZ12701 %3hhi:+0x80:0:-1: -# BZ12701 %*3hhi:+0x80:0:-1: +%3hhi:+0X80:0:-1: +%*3hhi:+0X80:0:-1: +%3hhi:+0x80:0:-1: +%*3hhi:+0x80:0:-1: %3hhi:+0200:1:3:2: %*3hhi:+0200:0:3: -# BZ12701 %3hhi:+0B10000000:0:-1: -# BZ12701 %*3hhi:+0B10000000:0:-1: -# BZ12701 %3hhi:+0b10000000:0:-1: -# BZ12701 %*3hhi:+0b10000000:0:-1: +%3hhi:+0B10000000:0:-1: +%*3hhi:+0B10000000:0:-1: +%3hhi:+0b10000000:0:-1: +%*3hhi:+0b10000000:0:-1: %3hhi:+169:1:3:16: %*3hhi:+169:0:3: -# BZ12701 %3hhi:+0Xa9:0:-1: -# BZ12701 %*3hhi:+0Xa9:0:-1: -# BZ12701 %3hhi:+0xA9:0:-1: -# BZ12701 %*3hhi:+0xA9:0:-1: +%3hhi:+0Xa9:0:-1: +%*3hhi:+0Xa9:0:-1: +%3hhi:+0xA9:0:-1: +%*3hhi:+0xA9:0:-1: %3hhi:+0251:1:3:2: %*3hhi:+0251:0:3: -# BZ12701 %3hhi:+0B10101001:0:-1: -# BZ12701 %*3hhi:+0B10101001:0:-1: -# BZ12701 %3hhi:+0b10101001:0:-1: -# BZ12701 %*3hhi:+0b10101001:0:-1: +%3hhi:+0B10101001:0:-1: +%*3hhi:+0B10101001:0:-1: +%3hhi:+0b10101001:0:-1: +%*3hhi:+0b10101001:0:-1: %5hhi::0:-1: %*5hhi::0:-1: %5hhi:-251:1:4:5: @@ -1164,76 +1164,76 @@ %*2hhi: -0b0:0:3: %2hhi: 0:1:2:0: %*2hhi: 0:0:2: -# BZ12701 %2hhi: 0X0:0:-1: -# BZ12701 %*2hhi: 0X0:0:-1: -# BZ12701 %2hhi: 0x0:0:-1: -# BZ12701 %*2hhi: 0x0:0:-1: +%2hhi: 0X0:0:-1: +%*2hhi: 0X0:0:-1: +%2hhi: 0x0:0:-1: +%*2hhi: 0x0:0:-1: %2hhi: 00:1:3:0: %*2hhi: 00:0:3: -# BZ12701 %2hhi: 0B0:0:-1: -# BZ12701 %*2hhi: 0B0:0:-1: -# BZ12701 %2hhi: 0b0:0:-1: -# BZ12701 %*2hhi: 0b0:0:-1: +%2hhi: 0B0:0:-1: +%*2hhi: 0B0:0:-1: +%2hhi: 0b0:0:-1: +%*2hhi: 0b0:0:-1: %2hhi: 1:1:2:1: %*2hhi: 1:0:2: -# BZ12701 %2hhi: 0X1:0:-1: -# BZ12701 %*2hhi: 0X1:0:-1: -# BZ12701 %2hhi: 0x1:0:-1: -# BZ12701 %*2hhi: 0x1:0:-1: +%2hhi: 0X1:0:-1: +%*2hhi: 0X1:0:-1: +%2hhi: 0x1:0:-1: +%*2hhi: 0x1:0:-1: %2hhi: 01:1:3:1: %*2hhi: 01:0:3: -# BZ12701 %2hhi: 0B1:0:-1: -# BZ12701 %*2hhi: 0B1:0:-1: -# BZ12701 %2hhi: 0b1:0:-1: -# BZ12701 %*2hhi: 0b1:0:-1: +%2hhi: 0B1:0:-1: +%*2hhi: 0B1:0:-1: +%2hhi: 0b1:0:-1: +%*2hhi: 0b1:0:-1: %2hhi: 42:1:3:42: %*2hhi: 42:0:3: -# BZ12701 %2hhi: 0X2a:0:-1: -# BZ12701 %*2hhi: 0X2a:0:-1: -# BZ12701 %2hhi: 0x2A:0:-1: -# BZ12701 %*2hhi: 0x2A:0:-1: +%2hhi: 0X2a:0:-1: +%*2hhi: 0X2a:0:-1: +%2hhi: 0x2A:0:-1: +%*2hhi: 0x2A:0:-1: %2hhi: 052:1:3:5: %*2hhi: 052:0:3: -# BZ12701 %2hhi: 0B101010:0:-1: -# BZ12701 %*2hhi: 0B101010:0:-1: -# BZ12701 %2hhi: 0b101010:0:-1: -# BZ12701 %*2hhi: 0b101010:0:-1: +%2hhi: 0B101010:0:-1: +%*2hhi: 0B101010:0:-1: +%2hhi: 0b101010:0:-1: +%*2hhi: 0b101010:0:-1: %2hhi: 127:1:3:12: %*2hhi: 127:0:3: -# BZ12701 %2hhi: 0X7f:0:-1: -# BZ12701 %*2hhi: 0X7f:0:-1: -# BZ12701 %2hhi: 0x7F:0:-1: -# BZ12701 %*2hhi: 0x7F:0:-1: +%2hhi: 0X7f:0:-1: +%*2hhi: 0X7f:0:-1: +%2hhi: 0x7F:0:-1: +%*2hhi: 0x7F:0:-1: %2hhi: 0177:1:3:1: %*2hhi: 0177:0:3: -# BZ12701 %2hhi: 0B1111111:0:-1: -# BZ12701 %*2hhi: 0B1111111:0:-1: -# BZ12701 %2hhi: 0b1111111:0:-1: -# BZ12701 %*2hhi: 0b1111111:0:-1: +%2hhi: 0B1111111:0:-1: +%*2hhi: 0B1111111:0:-1: +%2hhi: 0b1111111:0:-1: +%*2hhi: 0b1111111:0:-1: %2hhi: 128:1:3:12: %*2hhi: 128:0:3: -# BZ12701 %2hhi: 0X80:0:-1: -# BZ12701 %*2hhi: 0X80:0:-1: -# BZ12701 %2hhi: 0x80:0:-1: -# BZ12701 %*2hhi: 0x80:0:-1: +%2hhi: 0X80:0:-1: +%*2hhi: 0X80:0:-1: +%2hhi: 0x80:0:-1: +%*2hhi: 0x80:0:-1: %2hhi: 0200:1:3:2: %*2hhi: 0200:0:3: -# BZ12701 %2hhi: 0B10000000:0:-1: -# BZ12701 %*2hhi: 0B10000000:0:-1: -# BZ12701 %2hhi: 0b10000000:0:-1: -# BZ12701 %*2hhi: 0b10000000:0:-1: +%2hhi: 0B10000000:0:-1: +%*2hhi: 0B10000000:0:-1: +%2hhi: 0b10000000:0:-1: +%*2hhi: 0b10000000:0:-1: %2hhi: 169:1:3:16: %*2hhi: 169:0:3: -# BZ12701 %2hhi: 0Xa9:0:-1: -# BZ12701 %*2hhi: 0Xa9:0:-1: -# BZ12701 %2hhi: 0xA9:0:-1: -# BZ12701 %*2hhi: 0xA9:0:-1: +%2hhi: 0Xa9:0:-1: +%*2hhi: 0Xa9:0:-1: +%2hhi: 0xA9:0:-1: +%*2hhi: 0xA9:0:-1: %2hhi: 0251:1:3:2: %*2hhi: 0251:0:3: -# BZ12701 %2hhi: 0B10101001:0:-1: -# BZ12701 %*2hhi: 0B10101001:0:-1: -# BZ12701 %2hhi: 0b10101001:0:-1: -# BZ12701 %*2hhi: 0b10101001:0:-1: +%2hhi: 0B10101001:0:-1: +%*2hhi: 0B10101001:0:-1: +%2hhi: 0b10101001:0:-1: +%*2hhi: 0b10101001:0:-1: %2hhi: +0:1:3:0: %*2hhi: +0:0:3: %2hhi: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-llong-i.input b/stdio-common/tst-scanf-format-llong-i.input index f63e35d099..b8b3774dbc 100644 --- a/stdio-common/tst-scanf-format-llong-i.input +++ b/stdio-common/tst-scanf-format-llong-i.input @@ -510,76 +510,76 @@ %*2lli:-0b0:0:2: %2lli:0:1:1:0: %*2lli:0:0:1: -# BZ12701 %2lli:0X0:0:-1: -# BZ12701 %*2lli:0X0:0:-1: -# BZ12701 %2lli:0x0:0:-1: -# BZ12701 %*2lli:0x0:0:-1: +%2lli:0X0:0:-1: +%*2lli:0X0:0:-1: +%2lli:0x0:0:-1: +%*2lli:0x0:0:-1: %2lli:00:1:2:0: %*2lli:00:0:2: -# BZ12701 %2lli:0B0:0:-1: -# BZ12701 %*2lli:0B0:0:-1: -# BZ12701 %2lli:0b0:0:-1: -# BZ12701 %*2lli:0b0:0:-1: +%2lli:0B0:0:-1: +%*2lli:0B0:0:-1: +%2lli:0b0:0:-1: +%*2lli:0b0:0:-1: %2lli:1:1:1:1: %*2lli:1:0:1: -# BZ12701 %2lli:0X1:0:-1: -# BZ12701 %*2lli:0X1:0:-1: -# BZ12701 %2lli:0x1:0:-1: -# BZ12701 %*2lli:0x1:0:-1: +%2lli:0X1:0:-1: +%*2lli:0X1:0:-1: +%2lli:0x1:0:-1: +%*2lli:0x1:0:-1: %2lli:01:1:2:1: %*2lli:01:0:2: -# BZ12701 %2lli:0B1:0:-1: -# BZ12701 %*2lli:0B1:0:-1: -# BZ12701 %2lli:0b1:0:-1: -# BZ12701 %*2lli:0b1:0:-1: +%2lli:0B1:0:-1: +%*2lli:0B1:0:-1: +%2lli:0b1:0:-1: +%*2lli:0b1:0:-1: %2lli:42:1:2:42: %*2lli:42:0:2: -# BZ12701 %2lli:0X2a:0:-1: -# BZ12701 %*2lli:0X2a:0:-1: -# BZ12701 %2lli:0x2A:0:-1: -# BZ12701 %*2lli:0x2A:0:-1: +%2lli:0X2a:0:-1: +%*2lli:0X2a:0:-1: +%2lli:0x2A:0:-1: +%*2lli:0x2A:0:-1: %2lli:052:1:2:5: %*2lli:052:0:2: -# BZ12701 %2lli:0B101010:0:-1: -# BZ12701 %*2lli:0B101010:0:-1: -# BZ12701 %2lli:0b101010:0:-1: -# BZ12701 %*2lli:0b101010:0:-1: +%2lli:0B101010:0:-1: +%*2lli:0B101010:0:-1: +%2lli:0b101010:0:-1: +%*2lli:0b101010:0:-1: %2lli:9223372036854775807:1:2:92: %*2lli:9223372036854775807:0:2: -# BZ12701 %2lli:0X7fffffffffffffff:0:-1: -# BZ12701 %*2lli:0X7fffffffffffffff:0:-1: -# BZ12701 %2lli:0x7FFFFFFFFFFFFFFF:0:-1: -# BZ12701 %*2lli:0x7FFFFFFFFFFFFFFF:0:-1: +%2lli:0X7fffffffffffffff:0:-1: +%*2lli:0X7fffffffffffffff:0:-1: +%2lli:0x7FFFFFFFFFFFFFFF:0:-1: +%*2lli:0x7FFFFFFFFFFFFFFF:0:-1: %2lli:0777777777777777777777:1:2:7: %*2lli:0777777777777777777777:0:2: -# BZ12701 %2lli:0B111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2lli:0B111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %2lli:0b111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2lli:0b111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2lli:0B111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2lli:0B111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2lli:0b111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2lli:0b111111111111111111111111111111111111111111111111111111111111111:0:-1: %2lli:9223372036854775808:1:2:92: %*2lli:9223372036854775808:0:2: -# BZ12701 %2lli:0X8000000000000000:0:-1: -# BZ12701 %*2lli:0X8000000000000000:0:-1: -# BZ12701 %2lli:0x8000000000000000:0:-1: -# BZ12701 %*2lli:0x8000000000000000:0:-1: +%2lli:0X8000000000000000:0:-1: +%*2lli:0X8000000000000000:0:-1: +%2lli:0x8000000000000000:0:-1: +%*2lli:0x8000000000000000:0:-1: %2lli:01000000000000000000000:1:2:1: %*2lli:01000000000000000000000:0:2: -# BZ12701 %2lli:0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2lli:0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %2lli:0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2lli:0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2lli:0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2lli:0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2lli:0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2lli:0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: %2lli:9223372036897200049:1:2:92: %*2lli:9223372036897200049:0:2: -# BZ12701 %2lli:0X80000000028757b1:0:-1: -# BZ12701 %*2lli:0X80000000028757b1:0:-1: -# BZ12701 %2lli:0x80000000028757B1:0:-1: -# BZ12701 %*2lli:0x80000000028757B1:0:-1: +%2lli:0X80000000028757b1:0:-1: +%*2lli:0X80000000028757b1:0:-1: +%2lli:0x80000000028757B1:0:-1: +%*2lli:0x80000000028757B1:0:-1: %2lli:01000000000000241653661:1:2:1: %*2lli:01000000000000241653661:0:2: -# BZ12701 %2lli:0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2lli:0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %2lli:0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2lli:0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2lli:0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2lli:0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2lli:0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2lli:0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: %2lli:+0:1:2:0: %*2lli:+0:0:2: %2lli:+0X0:1:2:0: @@ -1164,76 +1164,76 @@ %*2lli: -0b0:0:3: %2lli: 0:1:2:0: %*2lli: 0:0:2: -# BZ12701 %2lli: 0X0:0:-1: -# BZ12701 %*2lli: 0X0:0:-1: -# BZ12701 %2lli: 0x0:0:-1: -# BZ12701 %*2lli: 0x0:0:-1: +%2lli: 0X0:0:-1: +%*2lli: 0X0:0:-1: +%2lli: 0x0:0:-1: +%*2lli: 0x0:0:-1: %2lli: 00:1:3:0: %*2lli: 00:0:3: -# BZ12701 %2lli: 0B0:0:-1: -# BZ12701 %*2lli: 0B0:0:-1: -# BZ12701 %2lli: 0b0:0:-1: -# BZ12701 %*2lli: 0b0:0:-1: +%2lli: 0B0:0:-1: +%*2lli: 0B0:0:-1: +%2lli: 0b0:0:-1: +%*2lli: 0b0:0:-1: %2lli: 1:1:2:1: %*2lli: 1:0:2: -# BZ12701 %2lli: 0X1:0:-1: -# BZ12701 %*2lli: 0X1:0:-1: -# BZ12701 %2lli: 0x1:0:-1: -# BZ12701 %*2lli: 0x1:0:-1: +%2lli: 0X1:0:-1: +%*2lli: 0X1:0:-1: +%2lli: 0x1:0:-1: +%*2lli: 0x1:0:-1: %2lli: 01:1:3:1: %*2lli: 01:0:3: -# BZ12701 %2lli: 0B1:0:-1: |
