printf: fix an out-of-bounds memory access

* src/printf.c (STRTOX): Don't access memory after a
string containing a single quote character.
* tests/misc/printf: Add tests for various combinations
of single quote characters combined with a numeric format.
* THANKS.in: Add bug reporter.
* NEWS: Mention the fix.

Reported-by: Paul Marinescu <paul.marinescu@imperial.ac.uk>
This commit is contained in:
Pádraig Brady committed 2011-05-18 07:33:04 +01:00
1 parent 50ca38e523
commit beaa949313
4 files changed
+30 -1

No files matched your search

+5
View File
@@ -2,6 +2,11 @@ GNU coreutils NEWS -*- outline -*-
* Noteworthy changes in release ?.? (????-??-??) [?]
** Bug fixes
printf '%d' '"' no longer accesses out-of-bounds memory in the diagnostic.
[bug introduced in sh-utils-1.16]
** New features
split accepts a new --filter=CMD option. With it, split filters output
+1
View File
@@ -449,6 +449,7 @@ Patrick Mauritz oxygene@studentenbude.ath.cx
Paul D. Smith psmith@gnu.org
Paul Ghaleb paul.ghaleb@st.com
Paul Jarc prj@po.cwru.edu
Paul Marinescu paul.marinescu@imperial.ac.uk
Paul Nevai nevai@ops.mps.ohio-state.edu
Paul Sauer paul@alexa.com
Paul Slootman paul@debian.org
+1 -1
View File
@@ -160,7 +160,7 @@ FUNC_NAME (char const *s) \
char *end; \
TYPE val; \
\
if (*s == '\"' || *s == '\'') \
if ((*s == '\"' || *s == '\'') && *(s + 1)) \
{ \
unsigned char ch = *++s; \
val = ch; \
+23
View File
@@ -96,4 +96,27 @@ EOF
compare out exp || fail=1
# Verify handling of single quote chars (\' or \")
"$prog" '%d\n' '"a' >out 2>err # valid
"$prog" '%d\n' '"a"' >>out 2>>err # invalid
"$prog" '%d\n' '"' >>out 2>>err # invalid
"$prog" '%d\n' 'a' >>out 2>>err # invalid
cat <<EOF > exp
97
97
0
0
EOF
cat <<EOF > exp_err
$prog: warning: ": character(s) following character constant have been ignored
$prog: ": expected a numeric value
$prog: a: expected a numeric value
EOF
compare out exp || fail=1
compare err exp_err || fail=1
Exit $fail