Mercurial > hg > octave-lyh > gnulib-hg
changeset 16964:b9ca6af780f5
parse-datetime: fix failure to diagnose invalid input
date -d "$(printf '\xb0')" would print 00:00:00 with today's date
rather than diagnosing the invalid input. Now it reports this:
date: invalid date '\260'
* lib/parse-datetime.y (to_uchar): Define.
(yylex): Don't sign-extend "other" bytes.
* m4/parse-datetime.m4: Require AC_C_INLINE for first use of "inline".
Thanks to Bruno Haible for the patch to this file.
* tests/test-parse-datetime.c (main): Add a test to trigger the bug.
Peter Evans reported the bug in GNU date: http://bugs.gnu.org/11843
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Wed, 04 Jul 2012 12:58:07 +0200 |
parents | 2bc936540c0f |
children | e95b3617aed5 |
files | ChangeLog lib/parse-datetime.y m4/parse-datetime.m4 tests/test-parse-datetime.c |
diffstat | 4 files changed, 26 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2012-07-04 Jim Meyering <meyering@redhat.com> + + parse-datetime: fix failure to diagnose invalid input + date -d "$(printf '\xb0')" would print 00:00:00 with today's date + rather than diagnosing the invalid input. Now it reports this: + date: invalid date '\260' + * lib/parse-datetime.y (to_uchar): Define. + (yylex): Don't sign-extend "other" bytes. + * m4/parse-datetime.m4: Require AC_C_INLINE for first use of "inline". + Thanks to Bruno Haible for the patch to this file. + * tests/test-parse-datetime.c (main): Add a test to trigger the bug. + Peter Evans reported the bug in GNU date: http://bugs.gnu.org/11843 + 2012-07-03 Jim Meyering <meyering@redhat.com> bootstrap: do not require now-removed build-aux/missing
--- a/lib/parse-datetime.y +++ b/lib/parse-datetime.y @@ -113,6 +113,11 @@ typedef time_t long_time_t; #endif +/* Convert a possibly-signed character to an unsigned character. This is + a bit safer than casting to unsigned char, since it catches some type + errors that the cast doesn't. */ +static inline unsigned char to_uchar (char ch) { return ch; } + /* Lots of this code assumes time_t and time_t-like values fit into long_time_t. */ verify (TYPE_MINIMUM (long_time_t) <= TYPE_MINIMUM (time_t) @@ -1171,7 +1176,8 @@ } if (c != '(') - return *pc->input++; + return to_uchar (*pc->input++); + count = 0; do {
--- a/m4/parse-datetime.m4 +++ b/m4/parse-datetime.m4 @@ -1,4 +1,4 @@ -# parse-datetime.m4 serial 19 +# parse-datetime.m4 serial 20 dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -32,6 +32,7 @@ dnl Prerequisites of lib/parse-datetime.y. AC_REQUIRE([gl_BISON]) + AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gl_C_COMPOUND_LITERALS]) AC_STRUCT_TIMEZONE AC_REQUIRE([gl_CLOCK_TIME])
--- a/tests/test-parse-datetime.c +++ b/tests/test-parse-datetime.c @@ -409,5 +409,9 @@ ASSERT (result.tv_sec == 24 * 3600 && result.tv_nsec == now.tv_nsec); + /* Exercise a sign-extension bug. Before July 2012, an input + starting with a high-bit-set byte would be treated like "0". */ + ASSERT ( ! parse_datetime (&result, "\xb0", &now)); + return 0; }