From 1c39128d974666107fc6d9ea15f294036851f224 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 18 Jan 2018 20:24:05 +0100 Subject: parsedate: fix date parsing for systems with 32 bit long Make curl_getdate() handle dates before 1970 as well (returning negative values). Make test 517 test dates for 64 bit time_t. This fixes bug (3) mentioned in #2238 Closes #2250 --- tests/data/test517 | 90 ------------------- tests/libtest/lib517.c | 228 +++++++++++++++++++++++++++---------------------- 2 files changed, 126 insertions(+), 192 deletions(-) (limited to 'tests') diff --git a/tests/data/test517 b/tests/data/test517 index 513634f15..f58f4edaa 100644 --- a/tests/data/test517 +++ b/tests/data/test517 @@ -32,96 +32,6 @@ nothing # Verify data after the test has been "shot" -0: Sun, 06 Nov 1994 08:49:37 GMT => 784111777 -1: Sunday, 06-Nov-94 08:49:37 GMT => 784111777 -2: Sun Nov 6 08:49:37 1994 => 784111777 -3: 06 Nov 1994 08:49:37 GMT => 784111777 -4: 06-Nov-94 08:49:37 GMT => 784111777 -5: Nov 6 08:49:37 1994 => 784111777 -6: 06 Nov 1994 08:49:37 => 784111777 -7: 06-Nov-94 08:49:37 => 784111777 -8: 1994 Nov 6 08:49:37 => 784111777 -9: GMT 08:49:37 06-Nov-94 Sunday => 784111777 -10: 94 6 Nov 08:49:37 => 784111777 -11: 1994 Nov 6 => 784080000 -12: 06-Nov-94 => 784080000 -13: Sun Nov 6 94 => 784080000 -14: 1994.Nov.6 => 784080000 -15: Sun/Nov/6/94/GMT => 784080000 -16: Sun, 06 Nov 1994 08:49:37 CET => 784108177 -17: 06 Nov 1994 08:49:37 EST => 784129777 -18: Sun, 12 Sep 2004 15:05:58 -0700 => 1095026758 -19: Sat, 11 Sep 2004 21:32:11 +0200 => 1094931131 -20: 20040912 15:05:58 -0700 => 1095026758 -21: 20040911 +0200 => 1094853600 -22: Thu, 01-Jan-1970 00:59:59 GMT => 3599 -23: Thu, 01-Jan-1970 01:00:00 GMT => 3600 -24: Sat, 15-Apr-17 21:01:22 GMT => 1492290082 -25: Thu, 19-Apr-2007 16:00:00 GMT => 1176998400 -26: Wed, 25 Apr 2007 21:02:13 GMT => 1177534933 -27: Thu, 19/Apr\2007 16:00:00 GMT => 1176998400 -28: Fri, 1 Jan 2010 01:01:50 GMT => 1262307710 -29: Wednesday, 1-Jan-2003 00:00:00 GMT => 1041379200 -30: , 1-Jan-2003 00:00:00 GMT => 1041379200 -31: 1-Jan-2003 00:00:00 GMT => 1041379200 -32: 1-Jan-2003 00:00:00 GMT => 1041379200 -33: Wed,18-Apr-07 22:50:12 GMT => 1176936612 -34: WillyWonka , 18-Apr-07 22:50:12 GMT => -1 -35: WillyWonka , 18-Apr-07 22:50:12 => -1 -36: WillyWonka , 18-apr-07 22:50:12 => -1 -37: Mon, 18-Apr-1977 22:50:13 GMT => 230251813 -38: Mon, 18-Apr-77 22:50:13 GMT => 230251813 -39: "Sat, 15-Apr-17\"21:01:22\"GMT" => 1492290082 -40: Partyday, 18- April-07 22:50:12 => -1 -41: Partyday, 18 - Apri-07 22:50:12 => -1 -42: Wednes, 1-Januar-2003 00:00:00 GMT => -1 -43: Sat, 15-Apr-17 21:01:22 => 1492290082 -44: Sat, 15-Apr-17 21:01:22 GMT-2 => 1492290082 -45: Sat, 15-Apr-17 21:01:22 GMT BLAH => 1492290082 -46: Sat, 15-Apr-17 21:01:22 GMT-0400 => 1492290082 -47: Sat, 15-Apr-17 21:01:22 GMT-0400 (EDT) => 1492290082 -48: Sat, 15-Apr-17 21:01:22 DST => -1 -49: Sat, 15-Apr-17 21:01:22 -0400 => 1492304482 -50: Sat, 15-Apr-17 21:01:22 (hello there) => -1 -51: Sat, 15-Apr-17 21:01:22 11:22:33 => -1 -52: Sat, 15-Apr-17 ::00 21:01:22 => -1 -53: Sat, 15-Apr-17 boink:z 21:01:22 => -1 -54: Sat, 15-Apr-17 91:22:33 21:01:22 => -1 -55: Thu Apr 18 22:50:12 2007 GMT => 1176936612 -56: 22:50:12 Thu Apr 18 2007 GMT => 1176936612 -57: Thu 22:50:12 Apr 18 2007 GMT => 1176936612 -58: Thu Apr 22:50:12 18 2007 GMT => 1176936612 -59: Thu Apr 18 22:50:12 2007 GMT => 1176936612 -60: Thu Apr 18 2007 22:50:12 GMT => 1176936612 -61: Thu Apr 18 2007 GMT 22:50:12 => 1176936612 -62: Sat, 15-Apr-17 21:01:22 GMT => 1492290082 -63: 15-Sat, Apr-17 21:01:22 GMT => 1492290082 -64: 15-Sat, Apr 21:01:22 GMT 17 => 1492290082 -65: 15-Sat, Apr 21:01:22 GMT 2017 => 1492290082 -66: 15 Apr 21:01:22 2017 => 1492290082 -67: 15 17 Apr 21:01:22 => 1492290082 -68: Apr 15 17 21:01:22 => 1492290082 -69: Apr 15 21:01:22 17 => 1492290082 -70: 2017 April 15 21:01:22 => -1 -71: 15 April 2017 21:01:22 => -1 -72: 98 April 17 21:01:22 => -1 -73: Thu, 012-Aug-2008 20:49:07 GMT => 1218574147 -74: Thu, 999999999999-Aug-2007 20:49:07 GMT => -1 -75: Thu, 12-Aug-2007 20:61:99999999999 GMT => -1 -76: IAintNoDateFool => -1 -77: Thu Apr 18 22:50 2007 GMT => 1176936600 -78: 20110623 12:34:56 => 1308832496 -79: 20110632 12:34:56 => -1 -80: 20110623 56:34:56 => -1 -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 # This test case previously tested an overflow case ("2094 Nov 6 => diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c index af7b2aa7a..a30c2d5ce 100644 --- a/tests/libtest/lib517.c +++ b/tests/libtest/lib517.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -23,117 +23,141 @@ #include "memdebug.h" -static const char * const dates[]={ - "Sun, 06 Nov 1994 08:49:37 GMT", - "Sunday, 06-Nov-94 08:49:37 GMT", - "Sun Nov 6 08:49:37 1994", - "06 Nov 1994 08:49:37 GMT", - "06-Nov-94 08:49:37 GMT", - "Nov 6 08:49:37 1994", - "06 Nov 1994 08:49:37", - "06-Nov-94 08:49:37", - "1994 Nov 6 08:49:37", - "GMT 08:49:37 06-Nov-94 Sunday", - "94 6 Nov 08:49:37", - "1994 Nov 6", - "06-Nov-94", - "Sun Nov 6 94", - "1994.Nov.6", - "Sun/Nov/6/94/GMT", - "Sun, 06 Nov 1994 08:49:37 CET", - "06 Nov 1994 08:49:37 EST", - "Sun, 12 Sep 2004 15:05:58 -0700", - "Sat, 11 Sep 2004 21:32:11 +0200", - "20040912 15:05:58 -0700", - "20040911 +0200", - "Thu, 01-Jan-1970 00:59:59 GMT", - "Thu, 01-Jan-1970 01:00:00 GMT", -/* "2094 Nov 6", See ../data/test517 for details */ - "Sat, 15-Apr-17 21:01:22 GMT", - "Thu, 19-Apr-2007 16:00:00 GMT", - "Wed, 25 Apr 2007 21:02:13 GMT", - "Thu, 19/Apr\\2007 16:00:00 GMT", - "Fri, 1 Jan 2010 01:01:50 GMT", - "Wednesday, 1-Jan-2003 00:00:00 GMT", - ", 1-Jan-2003 00:00:00 GMT", - " 1-Jan-2003 00:00:00 GMT", - "1-Jan-2003 00:00:00 GMT", - "Wed,18-Apr-07 22:50:12 GMT", - "WillyWonka , 18-Apr-07 22:50:12 GMT", - "WillyWonka , 18-Apr-07 22:50:12", - "WillyWonka , 18-apr-07 22:50:12", - "Mon, 18-Apr-1977 22:50:13 GMT", - "Mon, 18-Apr-77 22:50:13 GMT", - "\"Sat, 15-Apr-17\\\"21:01:22\\\"GMT\"", - "Partyday, 18- April-07 22:50:12", - "Partyday, 18 - Apri-07 22:50:12", - "Wednes, 1-Januar-2003 00:00:00 GMT", - "Sat, 15-Apr-17 21:01:22", - "Sat, 15-Apr-17 21:01:22 GMT-2", - "Sat, 15-Apr-17 21:01:22 GMT BLAH", - "Sat, 15-Apr-17 21:01:22 GMT-0400", - "Sat, 15-Apr-17 21:01:22 GMT-0400 (EDT)", - "Sat, 15-Apr-17 21:01:22 DST", - "Sat, 15-Apr-17 21:01:22 -0400", - "Sat, 15-Apr-17 21:01:22 (hello there)", - "Sat, 15-Apr-17 21:01:22 11:22:33", - "Sat, 15-Apr-17 ::00 21:01:22", - "Sat, 15-Apr-17 boink:z 21:01:22", - "Sat, 15-Apr-17 91:22:33 21:01:22", - "Thu Apr 18 22:50:12 2007 GMT", - "22:50:12 Thu Apr 18 2007 GMT", - "Thu 22:50:12 Apr 18 2007 GMT", - "Thu Apr 22:50:12 18 2007 GMT", - "Thu Apr 18 22:50:12 2007 GMT", - "Thu Apr 18 2007 22:50:12 GMT", - "Thu Apr 18 2007 GMT 22:50:12", - "Sat, 15-Apr-17 21:01:22 GMT", - "15-Sat, Apr-17 21:01:22 GMT", - "15-Sat, Apr 21:01:22 GMT 17", - "15-Sat, Apr 21:01:22 GMT 2017", - "15 Apr 21:01:22 2017", - "15 17 Apr 21:01:22", - "Apr 15 17 21:01:22", - "Apr 15 21:01:22 17", - "2017 April 15 21:01:22", - "15 April 2017 21:01:22", - "98 April 17 21:01:22", - "Thu, 012-Aug-2008 20:49:07 GMT", +struct dcheck { + const char *input; + time_t output; +}; + +struct dcheck dates[] = { + {"Sun, 06 Nov 1994 08:49:37 GMT", 784111777 }, + {"Sunday, 06-Nov-94 08:49:37 GMT", 784111777 }, + {"Sun Nov 6 08:49:37 1994", 784111777 }, + {"06 Nov 1994 08:49:37 GMT", 784111777 }, + {"06-Nov-94 08:49:37 GMT", 784111777 }, + {"Nov 6 08:49:37 1994", 784111777 }, + {"06 Nov 1994 08:49:37", 784111777 }, + {"06-Nov-94 08:49:37", 784111777 }, + {"1994 Nov 6 08:49:37", 784111777 }, + {"GMT 08:49:37 06-Nov-94 Sunday", 784111777 }, + {"94 6 Nov 08:49:37", 784111777 }, + {"1994 Nov 6", 784080000 }, + {"06-Nov-94", 784080000 }, + {"Sun Nov 6 94", 784080000 }, + {"1994.Nov.6", 784080000 }, + {"Sun/Nov/6/94/GMT", 784080000 }, + {"Sun, 06 Nov 1994 08:49:37 CET", 784108177 }, + {"06 Nov 1994 08:49:37 EST", 784129777 }, + {"Sun, 12 Sep 2004 15:05:58 -0700", 1095026758 }, + {"Sat, 11 Sep 2004 21:32:11 +0200", 1094931131 }, + {"20040912 15:05:58 -0700", 1095026758 }, + {"20040911 +0200", 1094853600 }, + {"Thu, 01-Jan-1970 00:59:59 GMT", 3599 }, + {"Thu, 01-Jan-1970 01:00:00 GMT", 3600 }, + {"Sat, 15-Apr-17 21:01:22 GMT", 1492290082 }, + {"Thu, 19-Apr-2007 16:00:00 GMT", 1176998400 }, + {"Wed, 25 Apr 2007 21:02:13 GMT", 1177534933 }, + {"Thu, 19/Apr\\2007 16:00:00 GMT", 1176998400 }, + {"Fri, 1 Jan 2010 01:01:50 GMT", 1262307710 }, + {"Wednesday, 1-Jan-2003 00:00:00 GMT", 1041379200 }, + {", 1-Jan-2003 00:00:00 GMT", 1041379200 }, + {"1-Jan-2003 00:00:00 GMT", 1041379200 }, + {"1-Jan-2003 00:00:00 GMT", 1041379200 }, + {"Wed,18-Apr-07 22:50:12 GMT", 1176936612 }, + {"WillyWonka , 18-Apr-07 22:50:12 GMT", -1 }, + {"WillyWonka , 18-Apr-07 22:50:12", -1 }, + {"WillyWonka , 18-apr-07 22:50:12", -1 }, + {"Mon, 18-Apr-1977 22:50:13 GMT", 230251813 }, + {"Mon, 18-Apr-77 22:50:13 GMT", 230251813 }, + {"Sat, 15-Apr-17\"21:01:22\"GMT", 1492290082 }, + {"Partyday, 18- April-07 22:50:12", -1 }, + {"Partyday, 18 - Apri-07 22:50:12", -1 }, + {"Wednes, 1-Januar-2003 00:00:00 GMT", -1 }, + {"Sat, 15-Apr-17 21:01:22", 1492290082 }, + {"Sat, 15-Apr-17 21:01:22 GMT-2", 1492290082 }, + {"Sat, 15-Apr-17 21:01:22 GMT BLAH", 1492290082 }, + {"Sat, 15-Apr-17 21:01:22 GMT-0400", 1492290082 }, + {"Sat, 15-Apr-17 21:01:22 GMT-0400 (EDT)", 1492290082 }, + {"Sat, 15-Apr-17 21:01:22 DST", -1 }, + {"Sat, 15-Apr-17 21:01:22 -0400", 1492304482 }, + {"Sat, 15-Apr-17 21:01:22 (hello there)", -1 }, + {"Sat, 15-Apr-17 21:01:22 11:22:33", -1 }, + {"Sat, 15-Apr-17 ::00 21:01:22", -1 }, + {"Sat, 15-Apr-17 boink:z 21:01:22", -1 }, + {"Sat, 15-Apr-17 91:22:33 21:01:22", -1 }, + {"Thu Apr 18 22:50:12 2007 GMT", 1176936612 }, + {"22:50:12 Thu Apr 18 2007 GMT", 1176936612 }, + {"Thu 22:50:12 Apr 18 2007 GMT", 1176936612 }, + {"Thu Apr 22:50:12 18 2007 GMT", 1176936612 }, + {"Thu Apr 18 22:50:12 2007 GMT", 1176936612 }, + {"Thu Apr 18 2007 22:50:12 GMT", 1176936612 }, + {"Thu Apr 18 2007 GMT 22:50:12", 1176936612 }, + {"Sat, 15-Apr-17 21:01:22 GMT", 1492290082 }, + {"15-Sat, Apr-17 21:01:22 GMT", 1492290082 }, + {"15-Sat, Apr 21:01:22 GMT 17", 1492290082 }, + {"15-Sat, Apr 21:01:22 GMT 2017", 1492290082 }, + {"15 Apr 21:01:22 2017", 1492290082 }, + {"15 17 Apr 21:01:22", 1492290082 }, + {"Apr 15 17 21:01:22", 1492290082 }, + {"Apr 15 21:01:22 17", 1492290082 }, + {"2017 April 15 21:01:22", -1 }, + {"15 April 2017 21:01:22", -1 }, + {"98 April 17 21:01:22", -1 }, + {"Thu, 012-Aug-2008 20:49:07 GMT", 1218574147 }, + {"Thu, 999999999999-Aug-2007 20:49:07 GMT", -1 }, + {"Thu, 12-Aug-2007 20:61:99999999999 GMT", -1 }, + {"IAintNoDateFool", -1 }, + {"Thu Apr 18 22:50 2007 GMT", 1176936600 }, + {"20110623 12:34:56", 1308832496 }, + {"20110632 12:34:56", -1 }, + {"20110623 56:34:56", -1 }, + {"20111323 12:34:56", -1 }, + {"20110623 12:34:79", -1 }, + {"Wed, 31 Dec 2008 23:59:60 GMT", 1230768000 }, + {"20110623 12:3", 1308830580 }, + {"20110623 1:3", 1308790980 }, + {"20110623 1:30", 1308792600 }, + {"20110623 12:12:3", 1308831123 }, + {"20110623 01:12:3", 1308791523 }, + {"20110623 01:99:30", -1 }, + {"Thu, 01-Jan-1970 00:00:00 GMT", 0 }, + {"Thu, 31-Dec-1969 23:59:58 GMT", -2 }, + {"Thu, 31-Dec-1969 23:59:59 GMT", 0 }, /* avoids -1 ! */ +#if SIZEOF_TIME_T > 4 + {"Sun, 06 Nov 2044 08:49:37 GMT", 2362034977 }, + {"Sun, 06 Nov 3144 08:49:37 GMT", 37074617377 }, +#ifndef HAVE_TIME_T_UNSIGNED #if 0 - /* leaving out these strings since they differ between 32 and 64 bit - archs and the test suite has no good way to support two different outputs - like that */ - "Thu, 12-Aug-31841 20:49:07 GMT", - "Thu, 12-Aug-9999999999 20:49:07 GMT", + /* causes warning on MSVC */ + {"Sun, 06 Nov 1900 08:49:37 GMT", -2182259423 }, +#endif + {"Sun, 06 Nov 1800 08:49:37 GMT", -5337933023 }, + {"Thu, 01-Jan-1583 00:00:00 GMT", -12212553600 }, +#endif + {"Thu, 01-Jan-1499 00:00:00 GMT", -1 }, +#else + {"Sun, 06 Nov 2044 08:49:37 GMT", -1 }, +#endif +#ifndef HAVE_TIME_T_UNSIGNED + {"Sun, 06 Nov 1968 08:49:37 GMT", -36342623 }, #endif - "Thu, 999999999999-Aug-2007 20:49:07 GMT", - "Thu, 12-Aug-2007 20:61:99999999999 GMT", - "IAintNoDateFool", - "Thu Apr 18 22:50 2007 GMT", /* without seconds */ - "20110623 12:34:56", - "20110632 12:34:56", - "20110623 56:34:56", - "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 + { NULL, 0 } }; int test(char *URL) { int i; + int error = 0; (void)URL; /* not used */ - for(i = 0; dates[i]; i++) { - printf("%d: %s => %ld\n", i, dates[i], (long)curl_getdate(dates[i], NULL)); + for(i = 0; dates[i].input; i++) { + time_t out = curl_getdate(dates[i].input, NULL); + if(out != dates[i].output) { + printf("WRONGLY %s => %ld (instead of %ld)\n", + dates[i].input, out, dates[i].output); + error++; + } } - return 0; + return error; } -- cgit v1.2.3