database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

Check for overflow in strtol() while parsing datetime inputs.

Browse Source 
Michael Fuhr.
This commit is contained in:
Tom Lane 2005-12-01 17:56:43 +00:00
parent bc0b56c0fe
commit 963a811a67
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/backend/utils/adt/datetime.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.160.2.1 2005/11/22 18:23:21 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.160.2.2 2005/12/01 17:56:43 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1013,7 +1013,10 @@ DecodeDateTime(char **field, int *ftype, int nf,
if (tzp == NULL) if (tzp == NULL)
return DTERR_BAD_FORMAT; return DTERR_BAD_FORMAT;
errno = 0;
val = strtol(field[i], &cp, 10); val = strtol(field[i], &cp, 10);
if (errno == ERANGE)
return DTERR_FIELD_OVERFLOW;
j2date(val, &tm->tm_year, &tm->tm_mon, &tm->tm_mday); j2date(val, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
/* Get the time zone from the end of the string */ /* Get the time zone from the end of the string */
@ -1158,7 +1161,10 @@ DecodeDateTime(char **field, int *ftype, int nf,
char *cp; char *cp;
int val; int val;
errno = 0;
val = strtol(field[i], &cp, 10); val = strtol(field[i], &cp, 10);
if (errno == ERANGE)
return DTERR_FIELD_OVERFLOW;
/* /*
* only a few kinds are allowed to have an embedded * only a few kinds are allowed to have an embedded
@ -1915,7 +1921,10 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
break; break;
} }
errno = 0;
val = strtol(field[i], &cp, 10); val = strtol(field[i], &cp, 10);
if (errno == ERANGE)
return DTERR_FIELD_OVERFLOW;
/* /*
* only a few kinds are allowed to have an embedded * only a few kinds are allowed to have an embedded
@ -2456,11 +2465,17 @@ DecodeTime(char *str, int fmask, int *tmask, struct pg_tm * tm, fsec_t *fsec)
*tmask = DTK_TIME_M; *tmask = DTK_TIME_M;
errno = 0;
tm->tm_hour = strtol(str, &cp, 10); tm->tm_hour = strtol(str, &cp, 10);
if (errno == ERANGE)
return DTERR_FIELD_OVERFLOW;
if (*cp != ':') if (*cp != ':')
return DTERR_BAD_FORMAT; return DTERR_BAD_FORMAT;
str = cp + 1; str = cp + 1;
errno = 0;
tm->tm_min = strtol(str, &cp, 10); tm->tm_min = strtol(str, &cp, 10);
if (errno == ERANGE)
return DTERR_FIELD_OVERFLOW;
if (*cp == '\0') if (*cp == '\0')
{ {
tm->tm_sec = 0; tm->tm_sec = 0;
@ -2471,7 +2486,10 @@ DecodeTime(char *str, int fmask, int *tmask, struct pg_tm * tm, fsec_t *fsec)
else else
{ {
str = cp + 1; str = cp + 1;
errno = 0;
tm->tm_sec = strtol(str, &cp, 10); tm->tm_sec = strtol(str, &cp, 10);
if (errno == ERANGE)
return DTERR_FIELD_OVERFLOW;
if (*cp == '\0') if (*cp == '\0')
*fsec = 0; *fsec = 0;
else if (*cp == '.') else if (*cp == '.')
@ -2522,7 +2540,10 @@ DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask,
*tmask = 0; *tmask = 0;
errno = 0;
val = strtol(str, &cp, 10); val = strtol(str, &cp, 10);
if (errno == ERANGE)
return DTERR_FIELD_OVERFLOW;
if (cp == str) if (cp == str)
return DTERR_BAD_FORMAT; return DTERR_BAD_FORMAT;
@ -2809,11 +2830,19 @@ DecodeTimezone(char *str, int *tzp)
if (*str != '+' && *str != '-') if (*str != '+' && *str != '-')
return DTERR_BAD_FORMAT; return DTERR_BAD_FORMAT;
errno = 0;
hr = strtol(str + 1, &cp, 10); hr = strtol(str + 1, &cp, 10);
if (errno == ERANGE)
return DTERR_TZDISP_OVERFLOW;
/* explicit delimiter? */ /* explicit delimiter? */
if (*cp == ':') if (*cp == ':')
{
errno = 0;
min = strtol(cp + 1, &cp, 10); min = strtol(cp + 1, &cp, 10);
if (errno == ERANGE)
return DTERR_TZDISP_OVERFLOW;
}
/* otherwise, might have run things together... */ /* otherwise, might have run things together... */
else if (*cp == '\0' && strlen(str) > 3) else if (*cp == '\0' && strlen(str) > 3)
{ {
@ -3056,7 +3085,10 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
case DTK_DATE: case DTK_DATE:
case DTK_NUMBER: case DTK_NUMBER:
errno = 0;
val = strtol(field[i], &cp, 10); val = strtol(field[i], &cp, 10);
if (errno == ERANGE)
return DTERR_FIELD_OVERFLOW;
if (type == IGNORE_DTF) if (type == IGNORE_DTF)
type = DTK_SECOND; type = DTK_SECOND;