Fix httpGetDateTime for dates in the far future (Issue #124)

Author: michaelrsweet

CHANGES.md

@@ -17,6 +17,7 @@ libcups v3.0.0 (YYYY-MM-DD)
 - Updated the `httpSetCookie` API to support multiple "Set-Cookie:" header
   values.
 - Updated `ippfind` to use the `cupsGetClock` API.
+- Fixed `httpGetDateTime` for dates in the far future (Issue #124)
 - Fixed input checks for `cupsCreateCredentials` and
   `cupsCreateCredentialsRequest` APIs (Issue #125)
 - Fixed return values of `ippDateToTime` when the timezone isn't GMT.

cups/http-support.c

@@ -655,7 +655,7 @@ httpGetDateTime(const char *s)		// I - Date/time string
   char		mon[16];		// Abbreviated month name
   int		day, year;		// Day of month and year
   int		hour, min, sec;		// Time
-  int		days;			// Number of days since 1970
+  long		days;			// Number of days since 1970
   static const int normal_days[] =	// Days to a month, normal years
 		{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 };
   static const int leap_days[] =	// Days to a month, leap years
@@ -694,14 +694,14 @@ httpGetDateTime(const char *s)		// I - Date/time string
   else
     days = normal_days[i] + day - 1;
 
-  DEBUG_printf("4httpGetDateTime: days=%d", days);
+  DEBUG_printf("4httpGetDateTime: days=%ld", days);
 
   days += (year - 1970) * 365 +		// 365 days per year (normally)
           ((year - 1) / 4 - 492) -	// + leap days
 	  ((year - 1) / 100 - 19) +	// - 100 year days
           ((year - 1) / 400 - 4);	// + 400 year days
 
-  DEBUG_printf("4httpGetDateTime: days=%d\n", days);
+  DEBUG_printf("4httpGetDateTime: days=%ld\n", days);
 
   return (days * 86400 + hour * 3600 + min * 60 + sec);
 }

cups/testhttp.c

@@ -206,6 +206,13 @@ static const char * const base64_tests[][2] =
 			};
 
 
+//
+// Local functions...
+//
+
+static bool	test_date(time_t t);
+
+
 //
 // 'main()' - Main entry.
 //
@@ -260,27 +267,14 @@ main(int  argc,				// I - Number of command-line arguments
     failures = 0;
 
     // httpGetDateString()/httpGetDateTime()
-    testBegin("httpGetDateString()/httpGetDateTime()");
-
-    start = time(NULL);
-    httpGetDateString(start, buffer, sizeof(buffer));
-    current = httpGetDateTime(buffer);
-
-    i = (int)(current - start);
-    if (i < 0)
-      i = -i;
-
-    if (!i)
-      testEnd(true);
-    else
-    {
+    if (!test_date(0))
+      failures ++;
+    if (!test_date(time(NULL)))
+      failures ++;
+    if (!test_date(INT_MAX))
+      failures ++;
+    if (!test_date(UINT_MAX))
       failures ++;
-      testEnd(false);
-      testError("Difference is %d seconds, %02d:%02d:%02d.", i, i / 3600, (i / 60) % 60, i % 60);
-      testError("httpGetDateString(%d) returned \"%s\"", (int)start, buffer);
-      testError("httpGetDateTime(\"%s\") returned %d", buffer, (int)current);
-      testError("httpGetDateString(%d) returned \"%s\"", (int)current, httpGetDateString(current, buffer, sizeof(buffer)));
-    }
 
     // httpDecode64()/httpEncode64()
     testBegin("httpDecode64()/httpEncode64()");
@@ -872,3 +866,39 @@ main(int  argc,				// I - Number of command-line arguments
 
   return (0);
 }
+
+
+//
+// 'test_date()' - Test the date/time functions for a specific time.
+//
+
+static bool				// O - `true` on success, `false` on failure
+test_date(time_t t)			// I - Time in seconds since Jan 1, 1970
+{
+  char		dateval[256];		// Date string
+  time_t	timeval;		// Time value
+
+
+  testBegin("httpGetDateString(%ld)", (long)t);
+  if (httpGetDateString(t, dateval, sizeof(dateval)))
+  {
+    testEndMessage(true, dateval);
+  }
+  else
+  {
+    testEnd(false);
+    return (false);
+  }
+
+  testBegin("httpGetDateTime(\"%s\")", dateval);
+  if ((timeval = httpGetDateTime(dateval)) == t)
+  {
+    testEnd(true);
+    return (true);
+  }
+  else
+  {
+    testEndMessage(false, "got %ld, expected %ld", timeval, t);
+    return (false);
+  }
+}