Commit 846ea08d authored by Bruce Momjian's avatar Bruce Momjian

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

check.
parent 7aee5ed3
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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 ...@@ -46,7 +46,7 @@ int32
pg_atoi(char *s, int size, int c) pg_atoi(char *s, int size, int c)
{ {
long l = 0; long l = 0;
char *badp; char *badp = NULL;
Assert(s); Assert(s);
...@@ -71,7 +71,7 @@ pg_atoi(char *s, int size, int c) ...@@ -71,7 +71,7 @@ pg_atoi(char *s, int size, int c)
*/ */
if (errno && errno != EINVAL) if (errno && errno != EINVAL)
elog(ERROR, "pg_atoi: error reading \"%s\": %m", s); 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); elog(ERROR, "pg_atoi: error in \"%s\": can\'t parse \"%s\"", s, badp);
switch (size) switch (size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment