diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-07-16 18:34:16 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-07-16 18:34:16 +0000 |
| commit | 846ea08d344b9795bab2632d31f289c264b0d078 (patch) | |
| tree | 18861f7f8636356a069eb10cfacca5607e4cf1de /src/backend/utils/adt/numutils.c | |
| parent | 7aee5ed3b73f3ef74d9905b838b6a4c2df5beb5e (diff) | |
| download | postgresql-846ea08d344b9795bab2632d31f289c264b0d078.tar.gz postgresql-846ea08d344b9795bab2632d31f289c264b0d078.zip | |
Oops, sometimes strtol isn't called in pg_atoi, so we do need that badp
check.
Diffstat (limited to 'src/backend/utils/adt/numutils.c')
| -rw-r--r-- | src/backend/utils/adt/numutils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 4fef85ad542..3a9c03db7a2 100644 --- 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) |