diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-05-05 21:38:40 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-05-05 21:38:40 +0000 |
| commit | 5d5cf912bc28e8aea13d2e6689bb9e67f166a40e (patch) | |
| tree | 1abbcba61866d2bd82ef119e481ba7edddaba6be /src/backend/utils/adt/arrayfuncs.c | |
| parent | 81ff51615d75d67d1dda4f387c5c6fd4a1abf24f (diff) | |
| download | postgresql-5d5cf912bc28e8aea13d2e6689bb9e67f166a40e.tar.gz postgresql-5d5cf912bc28e8aea13d2e6689bb9e67f166a40e.zip | |
I have two patches for 6.5.0:
arrayfuncs.patch fixes a small bug in my previous patches for
arrays
array-regress.patch adds _bpchar and _varchar to regression tests
--
Massimo Dal Zotto
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 8c5518bda39..948b7092753 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.40 1999/05/03 23:48:26 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.41 1999/05/05 21:38:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1336,10 +1336,16 @@ array_map(ArrayType *v, system_cache_lookup(retType, false, &typlen, &typbyval, &typdelim, &typelem, &proc, &typalign); - /* Allocate temporary array for new values */ ndim = ARR_NDIM(v); dim = ARR_DIMS(v); nitems = getNitems(ndim, dim); + + /* Check for empty array */ + if (nitems <= 0) { + return v; + } + + /* Allocate temporary array for new values */ values = (char **) palloc(nitems * sizeof(char *)); MemSet(values, 0, nitems * sizeof(char *)); |