diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-03-12 00:53:48 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-03-12 00:53:48 +0000 |
commit | 6578c68207f25fe10d77ec2dda90bce567a4326c (patch) | |
tree | a8195ba4f11022a7c0d4ba4a285533336b62c7e9 | |
parent | 2723d927e64a45452806f713d6eee90f1a1c50b4 (diff) | |
download | postgresql-6578c68207f25fe10d77ec2dda90bce567a4326c.tar.gz postgresql-6578c68207f25fe10d77ec2dda90bce567a4326c.zip |
Fix core dump due to null-pointer dereference in to_char() when datetime
format codes are misapplied to a numeric argument. (The code still produces
a pretty bogus error message in such cases, but I'll settle for stopping the
crash for now.) Per bug #4700 from Sergey Burladyan.
Problem exists in all supported branches, so patch all the way back.
In HEAD, also clean up some ugly coding in the nearby cache management
code.
-rw-r--r-- | src/backend/utils/adt/formatting.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 3b74ea8b7b6..58e299663a0 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * formatting.c * - * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.101.2.4 2007/06/29 01:51:56 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.101.2.5 2009/03/12 00:53:48 tgl Exp $ * * * Portions Copyright (c) 1999-2005, PostgreSQL Global Development Group @@ -347,7 +347,7 @@ static int DCHCounter = 0; /* global cache for --- number part */ static NUMCacheEntry NUMCache[NUM_CACHE_FIELDS + 1]; -static NUMCacheEntry *last_NUMCacheEntry; +static NUMCacheEntry *last_NUMCacheEntry = NUMCache + 0; static int n_NUMCache = 0; /* number of entries */ static int NUMCounter = 0; |