diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-12-08 23:57:03 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-12-08 23:57:03 +0000 |
| commit | 376784cf8ac7dee831471d7fd4159145d135636b (patch) | |
| tree | 62008e893458d778777a871f672c5545d5c9b241 /src/backend/utils/adt/varchar.c | |
| parent | fb47385fc8d2314dd7d23d691959c882ead1c31a (diff) | |
| download | postgresql-376784cf8ac7dee831471d7fd4159145d135636b.tar.gz postgresql-376784cf8ac7dee831471d7fd4159145d135636b.zip | |
Repair erroneous use of hashvarlena() for MACADDR, which is not a
varlena type. (I did not force initdb, but you won't see the fix
unless you do one.) Also, make sure all index support operators and
functions are careful not to leak memory for toasted inputs; I had
missed some hash and rtree support ops on this point before.
Diffstat (limited to 'src/backend/utils/adt/varchar.c')
| -rw-r--r-- | src/backend/utils/adt/varchar.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 3c58a254619..750d3dd665e 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.71 2000/11/26 11:35:23 ishii Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.72 2000/12/08 23:57:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -663,11 +663,17 @@ hashbpchar(PG_FUNCTION_ARGS) BpChar *key = PG_GETARG_BPCHAR_P(0); char *keydata; int keylen; + Datum result; keydata = VARDATA(key); keylen = bcTruelen(key); - return hash_any(keydata, keylen); + result = hash_any(keydata, keylen); + + /* Avoid leaking memory for toasted inputs */ + PG_FREE_IF_COPY(key, 0); + + return result; } |