Tweak ArrayCount() to forestall possible access to temp[-1]. Problem

tglsfdc · tglsfdc · commit 5fdb142f1653 · 2003-01-29T01:28:33.000Z
cannot actually happen at present because ArrayCount() is only called
on strings beginning with '{', but seems best to prevent it going forward.
Per report from Yichen Xie.
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.85 2002/11/13 00:39:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.86 2003/01/29 01:28:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -275,7 +275,7 @@ ArrayCount(char *str, int *dim, char typdelim)
 {
 	int			nest_level = 0,
 				i;
-	int			ndim = 0,
+	int			ndim = 1,
 				temp[MAXDIM];
 	bool		scanning_string = false;
 	bool		eoArray = false;

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/arrayfuncs.c,v 1.85 2002/11/13 00:39:47 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.86 2003/01/29 01:28:33 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -275,7 +275,7 @@ ArrayCount(char str, int dim, char typdelim)`
`275`	`275`	`{`
`276`	`276`	`int nest_level = 0,`
`277`	`277`	`i;`
`278`		`- int ndim = 0,`
	`278`	`+ int ndim = 1,`
`279`	`279`	`temp[MAXDIM];`
`280`	`280`	`bool scanning_string = false;`
`281`	`281`	`bool eoArray = false;`