Commitb7a0af7

Thomas G. Lockhart

committed

Check a bit more carefully for preceeding ISO field tags

when decoding date fields.

1 parentdd0279b commitb7a0af7Copy full SHA for b7a0af7

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.83 2001/12/29 18:31:29 thomas Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.84 2001/12/29 18:40:58 thomas Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -959,18 +959,18 @@ DecodeDateTime(char *field, int ftype, int nf,`
`959`	`959`	`if (tzp==NULL)`
`960`	`960`	`return-1;`
`961`	`961`
`962`		`-if (ptype!=0)`
`963`		`-{`
`964`		`-/* Sanity check; should not fail this test */`
`965`		`-if (ptype!=DTK_TIME)`
`966`		`-return-1;`
`967`		`-ptype=0;`
`968`		`-}`
`969`		`-`
`970`		`-if (isdigit(*field[i]))`
	`962`	`+if ((isdigit(*field[i])\|\| (ptype!=0))`
`971`	`963`	`{`
`972`	`964`	`char*cp;`
`973`	`965`
	`966`	`+if (ptype!=0)`
	`967`	`+{`
	`968`	`+/* Sanity check; should not fail this test */`
	`969`	`+if (ptype!=DTK_TIME)`
	`970`	`+return-1;`
	`971`	`+ptype=0;`
	`972`	`+}`
	`973`	`+`
`974`	`974`	`/* Starts with a digit but we already have a time field?`
`975`	`975`	`* Then we are in trouble with a date and time already...`
`976`	`976`	`*/`

Comments

(0)