Fix datetime input functions to correctly detect integer overflow when

running on a 64-bit platform ... strtol() will happily return 64-bit
output in that case.  Per bug #4231 from Geoff Tolley.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 95e2cd68cdeae44f2ea0837942ffd89cb59622b7..75e8f6fd5b360927ae1fcc33c331f5a8846f58aa 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.174.2.3 2008/02/25 23:21:15 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.174.2.4 2008/06/09 19:34:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -254,6 +254,23 @@ static const datetkn *datecache[MAXDATEFIELDS] = {NULL};
 static const datetkn *deltacache[MAXDATEFIELDS] = {NULL};
 
 
+/*
+ * strtoi --- just like strtol, but returns int not long
+ */
+static int
+strtoi(const char *nptr, char **endptr, int base)
+{
+   long    val;
+
+   val = strtol(nptr, endptr, base);
+#ifdef HAVE_LONG_INT_64
+   if (val != (long) ((int32) val))
+       errno = ERANGE;
+#endif
+   return (int) val;
+}
+
+
 /*
  * Calendar time to Julian date conversions.
  * Julian date is commonly used in astronomical applications,
@@ -706,7 +723,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
                        return DTERR_BAD_FORMAT;
 
                    errno = 0;
-                   val = strtol(field[i], &cp, 10);
+                   val = strtoi(field[i], &cp, 10);
                    if (errno == ERANGE)
                        return DTERR_FIELD_OVERFLOW;
 
@@ -854,7 +871,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
                    int         val;
 
                    errno = 0;
-                   val = strtol(field[i], &cp, 10);
+                   val = strtoi(field[i], &cp, 10);
                    if (errno == ERANGE)
                        return DTERR_FIELD_OVERFLOW;
 
@@ -1588,7 +1605,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
                    }
 
                    errno = 0;
-                   val = strtol(field[i], &cp, 10);
+                   val = strtoi(field[i], &cp, 10);
                    if (errno == ERANGE)
                        return DTERR_FIELD_OVERFLOW;
 
@@ -2204,14 +2221,14 @@ DecodeTime(char *str, int fmask, int *tmask, struct pg_tm * tm, fsec_t *fsec)
    *tmask = DTK_TIME_M;
 
    errno = 0;
-   tm->tm_hour = strtol(str, &cp, 10);
+   tm->tm_hour = strtoi(str, &cp, 10);
    if (errno == ERANGE)
        return DTERR_FIELD_OVERFLOW;
    if (*cp != ':')
        return DTERR_BAD_FORMAT;
    str = cp + 1;
    errno = 0;
-   tm->tm_min = strtol(str, &cp, 10);
+   tm->tm_min = strtoi(str, &cp, 10);
    if (errno == ERANGE)
        return DTERR_FIELD_OVERFLOW;
    if (*cp == '\0')
@@ -2225,7 +2242,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct pg_tm * tm, fsec_t *fsec)
    {
        str = cp + 1;
        errno = 0;
-       tm->tm_sec = strtol(str, &cp, 10);
+       tm->tm_sec = strtoi(str, &cp, 10);
        if (errno == ERANGE)
            return DTERR_FIELD_OVERFLOW;
        if (*cp == '\0')
@@ -2279,7 +2296,7 @@ DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask,
    *tmask = 0;
 
    errno = 0;
-   val = strtol(str, &cp, 10);
+   val = strtoi(str, &cp, 10);
    if (errno == ERANGE)
        return DTERR_FIELD_OVERFLOW;
    if (cp == str)
@@ -2570,7 +2587,7 @@ DecodeTimezone(char *str, int *tzp)
        return DTERR_BAD_FORMAT;
 
    errno = 0;
-   hr = strtol(str + 1, &cp, 10);
+   hr = strtoi(str + 1, &cp, 10);
    if (errno == ERANGE)
        return DTERR_TZDISP_OVERFLOW;
 
@@ -2578,13 +2595,13 @@ DecodeTimezone(char *str, int *tzp)
    if (*cp == ':')
    {
        errno = 0;
-       min = strtol(cp + 1, &cp, 10);
+       min = strtoi(cp + 1, &cp, 10);
        if (errno == ERANGE)
            return DTERR_TZDISP_OVERFLOW;
        if (*cp == ':')
        {
            errno = 0;
-           sec = strtol(cp + 1, &cp, 10);
+           sec = strtoi(cp + 1, &cp, 10);
            if (errno == ERANGE)
                return DTERR_TZDISP_OVERFLOW;
        }
@@ -2774,7 +2791,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
            case DTK_DATE:
            case DTK_NUMBER:
                errno = 0;
-               val = strtol(field[i], &cp, 10);
+               val = strtoi(field[i], &cp, 10);
                if (errno == ERANGE)
                    return DTERR_FIELD_OVERFLOW;