From: Bartosz Brachaczek <b.brachaczek@gmail.com>
To: musl@lists.openwall.com
Cc: Bartosz Brachaczek <b.brachaczek@gmail.com>
Subject: [PATCH] handle whitespace before %% in scanf
Date: Sun, 9 Jul 2017 23:00:18 +0200 [thread overview]
Message-ID: <20170709210018.16369-1-b.brachaczek@gmail.com> (raw)
this is mandated by C and POSIX standards and is in accordance with
glibc behavior.
---
src/stdio/vfscanf.c | 10 +++++++---
src/stdio/vfwscanf.c | 8 ++++++--
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c
index d4d2454b..9e030fc4 100644
--- a/src/stdio/vfscanf.c
+++ b/src/stdio/vfscanf.c
@@ -89,15 +89,19 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap)
continue;
}
if (*p != '%' || p[1] == '%') {
- p += *p=='%';
shlim(f, 0);
- c = shgetc(f);
+ if (*p == '%') {
+ p++;
+ while (isspace((c=shgetc(f))));
+ } else {
+ c = shgetc(f);
+ }
if (c!=*p) {
shunget(f);
if (c<0) goto input_fail;
goto match_fail;
}
- pos++;
+ pos += shcnt(f);
continue;
}
diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c
index ad8e2b9a..5d387a2d 100644
--- a/src/stdio/vfwscanf.c
+++ b/src/stdio/vfwscanf.c
@@ -117,8 +117,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
continue;
}
if (*p != '%' || p[1] == '%') {
- p += *p=='%';
- c = getwc(f);
+ if (*p == '%') {
+ p++;
+ while (iswspace((c=getwc(f)))) pos++;
+ } else {
+ c = getwc(f);
+ }
if (c!=*p) {
ungetwc(c, f);
if (c<0) goto input_fail;
--
2.13.0
next reply other threads:[~2017-07-09 21:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-09 21:00 Bartosz Brachaczek [this message]
2017-07-10 2:00 ` Rich Felker
2017-07-10 8:22 ` Bartosz Brachaczek
2017-07-10 14:44 ` Jens Gustedt
2017-07-10 20:59 ` Rich Felker
2017-09-04 22:00 ` Bartosz Brachaczek
2017-09-04 22:57 ` Jens Gustedt
2017-07-11 1:20 ` Rich Felker
2017-09-04 20:59 ` Rich Felker
2017-09-04 21:56 ` Bartosz Brachaczek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170709210018.16369-1-b.brachaczek@gmail.com \
--to=b.brachaczek@gmail.com \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).