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

check.

diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 4fef85ad5424ba1d0bfaa73b1631cf653994474e..3a9c03db7a2771b7bb514e26d02f151b5afda74c 100644 (file)
--- 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)