From f042400fb5e8891dbb1c99b58015fd71e22d9cb5 Mon Sep 17 00:00:00 2001 From: das Date: Sat, 31 Jan 2004 23:16:09 +0000 Subject: Fix the handling of negative hexadecimal numbers in integer formats. Note that this bug is unrelated to recent work in this area; it seems to have been present since revision 1.1. Obtained from: NetBSD --- lib/libc/stdio/vfscanf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib/libc/stdio') diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index a6c8d0e..dabf16e 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$"); #define NDIGITS 0x80 /* no digits detected */ #define PFXOK 0x100 /* 0x prefix is (still) legal */ #define NZDIGITS 0x200 /* no zero digits detected */ +#define HAVESIGN 0x10000 /* sign detected */ /* * Conversion types. @@ -679,13 +680,18 @@ literal: case '+': case '-': if (flags & SIGNOK) { flags &= ~SIGNOK; + flags |= HAVESIGN; goto ok; } break; - - /* x ok iff flag still set & 2nd char */ + + /* + * x ok iff flag still set & 2nd char (or + * 3rd char if we have a sign). + */ case 'x': case 'X': - if (flags & PFXOK && p == buf + 1) { + if (flags & PFXOK && p == + buf + 1 + !!(flags & HAVESIGN)) { base = 16; /* if %i */ flags &= ~PFXOK; goto ok; -- cgit v1.1