diff options
| author | Thomas G. Lockhart <lockhart@fourpalms.org> | 2001-12-29 18:40:58 +0000 |
|---|---|---|
| committer | Thomas G. Lockhart <lockhart@fourpalms.org> | 2001-12-29 18:40:58 +0000 |
| commit | b7a0af7d6475b1bec488607aaf7e2bbf3a7996a2 (patch) | |
| tree | d07b2722eb77b590d20805846436697170cd9068 /src/backend/utils/adt/datetime.c | |
| parent | dd0279b1baf3b4bc5add9cb10868c5848fe227ba (diff) | |
| download | postgresql-b7a0af7d6475b1bec488607aaf7e2bbf3a7996a2.tar.gz postgresql-b7a0af7d6475b1bec488607aaf7e2bbf3a7996a2.zip | |
Check a bit more carefully for preceeding ISO field tags
when decoding date fields.
Diffstat (limited to 'src/backend/utils/adt/datetime.c')
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 864fede75b7..fa6bb88289a 100644 --- 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.83 2001/12/29 18:31:29 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.84 2001/12/29 18:40:58 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -959,18 +959,18 @@ DecodeDateTime(char **field, int *ftype, int nf, if (tzp == NULL) return -1; - if (ptype != 0) - { - /* Sanity check; should not fail this test */ - if (ptype != DTK_TIME) - return -1; - ptype = 0; - } - - if (isdigit(*field[i])) + if ((isdigit(*field[i]) || (ptype != 0)) { char *cp; + if (ptype != 0) + { + /* Sanity check; should not fail this test */ + if (ptype != DTK_TIME) + return -1; + ptype = 0; + } + /* Starts with a digit but we already have a time field? * Then we are in trouble with a date and time already... */ |