Oops, sometimes strtol isn't called in pg_atoi, so we do need that badp

bmomjian · bmomjian · commit 846ea08d344b · 2002-07-16T18:34:16.000Z
check.
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.50 2002/07/16 17:55:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.51 2002/07/16 18:34:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@ int32
 pg_atoi(char *s, int size, int c)
 {
 	long		l = 0;
-	char	   *badp;
+	char	   *badp = NULL;
 
 	Assert(s);
 
@@ -71,7 +71,7 @@ pg_atoi(char *s, int size, int c)
 	 */
 	if (errno && errno != EINVAL)
 		elog(ERROR, "pg_atoi: error reading \"%s\": %m", s);
-	if (*badp && *badp != c)
+	if (badp && *badp && *badp != c)
 		elog(ERROR, "pg_atoi: error in \"%s\": can\'t parse \"%s\"", s, badp);
 
 	switch (size)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.50 2002/07/16 17:55:25 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.51 2002/07/16 18:34:16 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -46,7 +46,7 @@ int32`
`46`	`46`	`pg_atoi(char *s, int size, int c)`
`47`	`47`	`{`
`48`	`48`	`long l = 0;`
`49`		`- char *badp;`
	`49`	`+ char *badp = NULL;`
`50`	`50`
`51`	`51`	`Assert(s);`
`52`	`52`
`@@ -71,7 +71,7 @@ pg_atoi(char *s, int size, int c)`
`71`	`71`	`*/`
`72`	`72`	`if (errno && errno != EINVAL)`
`73`	`73`	`elog(ERROR, "pg_atoi: error reading \"%s\": %m", s);`
`74`		`- if (badp && badp != c)`
	`74`	`+ if (badp && badp && badp != c)`
`75`	`75`	`elog(ERROR, "pg_atoi: error in \"%s\": can\'t parse \"%s\"", s, badp);`
`76`	`76`
`77`	`77`	`switch (size)`