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 94f996766bb1b56f0870ea66cf56aaea1f4dd57f..ba0cb8e7cbb02583191f27d70bec39f0198bc7cd 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.118.2.8 2008/01/02 22:05:36 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.118.2.9 2008/06/09 19:34:40 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -579,6 +579,23 @@ static datetkn *datecache[MAXDATEFIELDS] = {NULL};
 static 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,
@@ -978,7 +995,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;
 
@@ -1126,7 +1143,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;
 
@@ -1870,7 +1887,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;
 
@@ -2415,14 +2432,14 @@ DecodeTime(char *str, int fmask, int *tmask, struct 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')
@@ -2436,7 +2453,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct 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')
@@ -2493,7 +2510,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)
@@ -2784,7 +2801,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;
 
@@ -2792,7 +2809,7 @@ 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;
        }
@@ -3041,7 +3058,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
                        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;