diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-10-04 16:59:38 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-10-31 08:46:35 +0100 |
| commit | 96a80b5a262fb6dd2ddcea7987296f3b9a405618 (patch) | |
| tree | 9177b1a1a49154698514770767bb091d7e6db46c | |
| parent | 46133aa536f7f5bf552b83369e3851b6f811299e (diff) | |
parsedate: handle cut off numbers better
... and don't read outside of the given buffer!
CVE-2016-8621
bug: https://curl.haxx.se/docs/adv_20161102G.html
Reported-by: Luật Nguyễn
| -rw-r--r-- | lib/parsedate.c | 12 | ||||
| -rw-r--r-- | tests/data/test517 | 6 | ||||
| -rw-r--r-- | tests/libtest/lib517.c | 8 |
3 files changed, 20 insertions, 6 deletions
diff --git a/lib/parsedate.c b/lib/parsedate.c index dfcf855c8..8e932f4cd 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -386,15 +386,17 @@ static int parsedate(const char *date, time_t *output) /* a digit */ int val; char *end; + int len=0; if((secnum == -1) && - (3 == sscanf(date, "%02d:%02d:%02d", &hournum, &minnum, &secnum))) { + (3 == sscanf(date, "%02d:%02d:%02d%n", + &hournum, &minnum, &secnum, &len))) { /* time stamp! */ - date += 8; + date += len; } else if((secnum == -1) && - (2 == sscanf(date, "%02d:%02d", &hournum, &minnum))) { + (2 == sscanf(date, "%02d:%02d%n", &hournum, &minnum, &len))) { /* time stamp without seconds */ - date += 5; + date += len; secnum = 0; } else { diff --git a/tests/data/test517 b/tests/data/test517 index c81a45e0a..513634f15 100644 --- a/tests/data/test517 +++ b/tests/data/test517 @@ -116,6 +116,12 @@ nothing 81: 20111323 12:34:56 => -1 82: 20110623 12:34:79 => -1 83: Wed, 31 Dec 2008 23:59:60 GMT => 1230768000 +84: 20110623 12:3 => 1308830580 +85: 20110623 1:3 => 1308790980 +86: 20110623 1:30 => 1308792600 +87: 20110623 12:12:3 => 1308831123 +88: 20110623 01:12:3 => 1308791523 +89: 20110623 01:99:30 => -1 </stdout> # This test case previously tested an overflow case ("2094 Nov 6 => diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c index 2f68ebd24..22162ff1e 100644 --- a/tests/libtest/lib517.c +++ b/tests/libtest/lib517.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -116,6 +116,12 @@ static const char * const dates[]={ "20111323 12:34:56", "20110623 12:34:79", "Wed, 31 Dec 2008 23:59:60 GMT", /* leap second */ + "20110623 12:3", + "20110623 1:3", + "20110623 1:30", + "20110623 12:12:3", + "20110623 01:12:3", + "20110623 01:99:30", NULL }; |