Fix varatt versus Datum type confusions

Macros like VARDATA() and VARSIZE() should be thought of as taking
values of type pointer to struct varlena or some other related struct.
The way they are implemented, you can pass anything to it and it will
cast it right.  But this is in principle incorrect.  To fix, add the
required DatumGetPointer() calls.  Or in a couple of cases, remove
superfluous PointerGetDatum() calls.

It is planned in a subsequent patch to change macros like VARDATA()
and VARSIZE() to inline functions, which will enforce stricter typing.
This is in preparation for that.

Reviewed-by: Tom Lane <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/928ea48f-77c6-417b-897c-621ef16685a6%40eisentraut.org

diff --git a/contrib/hstore/hstore_gin.c b/contrib/hstore/hstore_gin.c
index 766c00bb6a7352378061b703dbbff7b63e945230..2e5fa115924ba8177397b461ab6bdb6cf9a5342a 100644 (file)
--- a/contrib/hstore/hstore_gin.c
+++ b/contrib/hstore/hstore_gin.c
@@ -127,7 +127,7 @@ gin_extract_hstore_query(PG_FUNCTION_ARGS)
            /* Nulls in the array are ignored, cf hstoreArrayToPairs */
            if (key_nulls[i])
                continue;
-           item = makeitem(VARDATA(key_datums[i]), VARSIZE(key_datums[i]) - VARHDRSZ, KEYFLAG);
+           item = makeitem(VARDATA(DatumGetPointer(key_datums[i])), VARSIZE(DatumGetPointer(key_datums[i])) - VARHDRSZ, KEYFLAG);
            entries[j++] = PointerGetDatum(item);
        }
 

diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index a3b08af385016c0bdf0db6379a6fe7f0a11cfaea..69515dc3d3fbd80f5e558299b6dcb654e729daf7 100644 (file)
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -576,7 +576,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
 
            if (key_nulls[i])
                continue;
-           crc = crc32_sz(VARDATA(key_datums[i]), VARSIZE(key_datums[i]) - VARHDRSZ);
+           crc = crc32_sz(VARDATA(DatumGetPointer(key_datums[i])), VARSIZE(DatumGetPointer(key_datums[i])) - VARHDRSZ);
            if (!(GETBIT(sign, HASHVAL(crc, siglen))))
                res = false;
        }
@@ -599,7 +599,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
 
            if (key_nulls[i])
                continue;
-           crc = crc32_sz(VARDATA(key_datums[i]), VARSIZE(key_datums[i]) - VARHDRSZ);
+           crc = crc32_sz(VARDATA(DatumGetPointer(key_datums[i])), VARSIZE(DatumGetPointer(key_datums[i])) - VARHDRSZ);
            if (GETBIT(sign, HASHVAL(crc, siglen)))
                res = true;
        }

diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 4f867e4bd1f1cebcc586747d76c7c5ecb9027a58..9c53877c4a582882658982297f99c347cfc0a41b 100644 (file)
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -684,22 +684,22 @@ hstore_from_arrays(PG_FUNCTION_ARGS)
 
        if (!value_nulls || value_nulls[i])
        {
-           pairs[i].key = VARDATA(key_datums[i]);
+           pairs[i].key = VARDATA(DatumGetPointer(key_datums[i]));
            pairs[i].val = NULL;
            pairs[i].keylen =
-               hstoreCheckKeyLen(VARSIZE(key_datums[i]) - VARHDRSZ);
+               hstoreCheckKeyLen(VARSIZE(DatumGetPointer(key_datums[i])) - VARHDRSZ);
            pairs[i].vallen = 4;
            pairs[i].isnull = true;
            pairs[i].needfree = false;
        }
        else
        {
-           pairs[i].key = VARDATA(key_datums[i]);
-           pairs[i].val = VARDATA(value_datums[i]);
+           pairs[i].key = VARDATA(DatumGetPointer(key_datums[i]));
+           pairs[i].val = VARDATA(DatumGetPointer(value_datums[i]));
            pairs[i].keylen =
-               hstoreCheckKeyLen(VARSIZE(key_datums[i]) - VARHDRSZ);
+               hstoreCheckKeyLen(VARSIZE(DatumGetPointer(key_datums[i])) - VARHDRSZ);
            pairs[i].vallen =
-               hstoreCheckValLen(VARSIZE(value_datums[i]) - VARHDRSZ);
+               hstoreCheckValLen(VARSIZE(DatumGetPointer(value_datums[i])) - VARHDRSZ);
            pairs[i].isnull = false;
            pairs[i].needfree = false;
        }
@@ -778,22 +778,22 @@ hstore_from_array(PG_FUNCTION_ARGS)
 
        if (in_nulls[i * 2 + 1])
        {
-           pairs[i].key = VARDATA(in_datums[i * 2]);
+           pairs[i].key = VARDATA(DatumGetPointer(in_datums[i * 2]));
            pairs[i].val = NULL;
            pairs[i].keylen =
-               hstoreCheckKeyLen(VARSIZE(in_datums[i * 2]) - VARHDRSZ);
+               hstoreCheckKeyLen(VARSIZE(DatumGetPointer(in_datums[i * 2])) - VARHDRSZ);
            pairs[i].vallen = 4;
            pairs[i].isnull = true;
            pairs[i].needfree = false;
        }
        else
        {
-           pairs[i].key = VARDATA(in_datums[i * 2]);
-           pairs[i].val = VARDATA(in_datums[i * 2 + 1]);
+           pairs[i].key = VARDATA(DatumGetPointer(in_datums[i * 2]));
+           pairs[i].val = VARDATA(DatumGetPointer(in_datums[i * 2 + 1]));
            pairs[i].keylen =
-               hstoreCheckKeyLen(VARSIZE(in_datums[i * 2]) - VARHDRSZ);
+               hstoreCheckKeyLen(VARSIZE(DatumGetPointer(in_datums[i * 2])) - VARHDRSZ);
            pairs[i].vallen =
-               hstoreCheckValLen(VARSIZE(in_datums[i * 2 + 1]) - VARHDRSZ);
+               hstoreCheckValLen(VARSIZE(DatumGetPointer(in_datums[i * 2 + 1])) - VARHDRSZ);
            pairs[i].isnull = false;
            pairs[i].needfree = false;
        }

diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index 5e57eceffc8179b01bb1076236eee0befc209673..bcba75f92580869b30311b74d6efe2a4395ffa63 100644 (file)
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -107,8 +107,8 @@ hstoreArrayToPairs(ArrayType *a, int *npairs)
    {
        if (!key_nulls[i])
        {
-           key_pairs[j].key = VARDATA(key_datums[i]);
-           key_pairs[j].keylen = VARSIZE(key_datums[i]) - VARHDRSZ;
+           key_pairs[j].key = VARDATA(DatumGetPointer(key_datums[i]));
+           key_pairs[j].keylen = VARSIZE(DatumGetPointer(key_datums[i])) - VARHDRSZ;
            key_pairs[j].val = NULL;
            key_pairs[j].vallen = 0;
            key_pairs[j].needfree = 0;

diff --git a/contrib/test_decoding/test_decoding.c b/contrib/test_decoding/test_decoding.c
index bb495563200c386374b2b0d213ed669401ac007d..f671a7d4b3125c56db7fba452d43fd3f500e3031 100644 (file)
--- a/contrib/test_decoding/test_decoding.c
+++ b/contrib/test_decoding/test_decoding.c
@@ -581,7 +581,7 @@ tuple_to_stringinfo(StringInfo s, TupleDesc tupdesc, HeapTuple tuple, bool skip_
        /* print data */
        if (isnull)
            appendStringInfoString(s, "null");
-       else if (typisvarlena && VARATT_IS_EXTERNAL_ONDISK(origval))
+       else if (typisvarlena && VARATT_IS_EXTERNAL_ONDISK(DatumGetPointer(origval)))
            appendStringInfoString(s, "unchanged-toast-datum");
        else if (!typisvarlena)
            print_literal(s, typid,

diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c
index 0d1507a2a36248e6ca427d81a180bb8916fafd34..b85a70a0db28ec34f975c340f5fee3b1e8e9dd6f 100644 (file)
--- a/src/backend/access/brin/brin_minmax_multi.c
+++ b/src/backend/access/brin/brin_minmax_multi.c
@@ -624,7 +624,7 @@ brin_range_serialize(Ranges *range)
 
        for (i = 0; i < nvalues; i++)
        {
-           len += VARSIZE_ANY(range->values[i]);
+           len += VARSIZE_ANY(DatumGetPointer(range->values[i]));
        }
    }
    else if (typlen == -2)      /* cstring */

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 969d1028cae89d10c6909652dbb95bd288aa7d20..a410b5eb99b99247ce7b233f8f91ea3e8474ee09 100644 (file)
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -189,7 +189,7 @@ getmissingattr(TupleDesc tupleDesc,
            if (att->attlen > 0)
                key.len = att->attlen;
            else
-               key.len = VARSIZE_ANY(attrmiss->am_value);
+               key.len = VARSIZE_ANY(DatumGetPointer(attrmiss->am_value));
            key.value = attrmiss->am_value;
 
            entry = hash_search(missing_cache, &key, HASH_ENTER, &found);
@@ -901,9 +901,9 @@ expand_tuple(HeapTuple *targetHeapTuple,
                                                  att->attlen,
                                                  attrmiss[attnum].am_value);
 
-               targetDataLen = att_addlength_pointer(targetDataLen,
-                                                     att->attlen,
-                                                     attrmiss[attnum].am_value);
+               targetDataLen = att_addlength_datum(targetDataLen,
+                                                   att->attlen,
+                                                   attrmiss[attnum].am_value);
            }
            else
            {

diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index 50747c163961221c53cb3614e5183e95fe1440e9..594a657ea1a78aa5a849fdee58ab07fda400bc0a 100644 (file)
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -1190,8 +1190,8 @@ transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
 
        for (i = 0; i < noldoptions; i++)
        {
-           char       *text_str = VARDATA(oldoptions[i]);
-           int         text_len = VARSIZE(oldoptions[i]) - VARHDRSZ;
+           char       *text_str = VARDATA(DatumGetPointer(oldoptions[i]));
+           int         text_len = VARSIZE(DatumGetPointer(oldoptions[i])) - VARHDRSZ;
 
            /* Search for a match in defList */
            foreach(cell, defList)
@@ -1456,8 +1456,8 @@ parseRelOptionsInternal(Datum options, bool validate,
 
    for (i = 0; i < noptions; i++)
    {
-       char       *text_str = VARDATA(optiondatums[i]);
-       int         text_len = VARSIZE(optiondatums[i]) - VARHDRSZ;
+       char       *text_str = VARDATA(DatumGetPointer(optiondatums[i]));
+       int         text_len = VARSIZE(DatumGetPointer(optiondatums[i])) - VARHDRSZ;
        int         j;
 
        /* Search for a match in reloptions */

diff --git a/src/backend/access/common/toast_internals.c b/src/backend/access/common/toast_internals.c
index 7d8be8346ce5238e356258994a1123ce9b3da1a7..196e06115e936057f9a21a275cdb2fca93c184ff 100644 (file)
--- a/src/backend/access/common/toast_internals.c
+++ b/src/backend/access/common/toast_internals.c
@@ -144,7 +144,7 @@ toast_save_datum(Relation rel, Datum value,
    int         num_indexes;
    int         validIndex;
 
-   Assert(!VARATT_IS_EXTERNAL(value));
+   Assert(!VARATT_IS_EXTERNAL(dval));
 
    /*
     * Open the toast relation and its indexes.  We can use the index to check

diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index a65acd89104931747391563def39c6b7759ae4f0..47b1898a064639bd6116e9026b2ba19b31e1249f 100644 (file)
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -2233,7 +2233,7 @@ _gin_build_tuple(OffsetNumber attrnum, unsigned char category,
    else if (typlen > 0)
        keylen = typlen;
    else if (typlen == -1)
-       keylen = VARSIZE_ANY(key);
+       keylen = VARSIZE_ANY(DatumGetPointer(key));
    else if (typlen == -2)
        keylen = strlen(DatumGetPointer(key)) + 1;
    else

diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index 95fea74e296f8500c54404acd1349f525039d7e7..9b86c016acb37b2b274d96ea7a9618adf5243b56 100644 (file)
--- a/src/backend/access/spgist/spgutils.c
+++ b/src/backend/access/spgist/spgutils.c
@@ -785,7 +785,7 @@ SpGistGetInnerTypeSize(SpGistTypeDesc *att, Datum datum)
    else if (att->attlen > 0)
        size = att->attlen;
    else
-       size = VARSIZE_ANY(datum);
+       size = VARSIZE_ANY(DatumGetPointer(datum));
 
    return MAXALIGN(size);
 }
@@ -804,7 +804,7 @@ memcpyInnerDatum(void *target, SpGistTypeDesc *att, Datum datum)
    }
    else
    {
-       size = (att->attlen > 0) ? att->attlen : VARSIZE_ANY(datum);
+       size = (att->attlen > 0) ? att->attlen : VARSIZE_ANY(DatumGetPointer(datum));
        memcpy(target, DatumGetPointer(datum), size);
    }
 }

diff --git a/src/backend/access/table/toast_helper.c b/src/backend/access/table/toast_helper.c
index b60fab0a4d29436b012a56d82890770c02010e9b..11f97d65367d56d1f09f2252246080151ca2d779 100644 (file)
--- a/src/backend/access/table/toast_helper.c
+++ b/src/backend/access/table/toast_helper.c
@@ -330,7 +330,7 @@ toast_delete_external(Relation rel, const Datum *values, const bool *isnull,
 
            if (isnull[i])
                continue;
-           else if (VARATT_IS_EXTERNAL_ONDISK(value))
+           else if (VARATT_IS_EXTERNAL_ONDISK(DatumGetPointer(value)))
                toast_delete_datum(rel, value, is_speculative);
        }
    }

diff --git a/src/backend/replication/logical/proto.c b/src/backend/replication/logical/proto.c
index 1a352b542dc5670d2838149c5e51e1b042b9254c..1b3d9eb49dd7028105237566cbcb966ce71446c3 100644 (file)
--- a/src/backend/replication/logical/proto.c
+++ b/src/backend/replication/logical/proto.c
@@ -809,7 +809,7 @@ logicalrep_write_tuple(StringInfo out, Relation rel, TupleTableSlot *slot,
            continue;
        }
 
-       if (att->attlen == -1 && VARATT_IS_EXTERNAL_ONDISK(values[i]))
+       if (att->attlen == -1 && VARATT_IS_EXTERNAL_ONDISK(DatumGetPointer(values[i])))
        {
            /*
             * Unchanged toasted datum.  (Note that we don't promise to detect

diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index f4c977262c5a4a2d6455f93ee04f6f8991b492f3..80540c017bd3aa5b66ebe1a7b674f2d2b8a7e067 100644 (file)
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -1374,8 +1374,8 @@ pgoutput_row_filter(Relation relation, TupleTableSlot *old_slot,
         * VARTAG_INDIRECT. See ReorderBufferToastReplace.
         */
        if (att->attlen == -1 &&
-           VARATT_IS_EXTERNAL_ONDISK(new_slot->tts_values[i]) &&
-           !VARATT_IS_EXTERNAL_ONDISK(old_slot->tts_values[i]))
+           VARATT_IS_EXTERNAL_ONDISK(DatumGetPointer(new_slot->tts_values[i])) &&
+           !VARATT_IS_EXTERNAL_ONDISK(DatumGetPointer(old_slot->tts_values[i])))
        {
            if (!tmp_new_slot)
            {

diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c
index d98cda698d94195334f3ba7ffdfb6a0d87cc9482..f59fb82154370fc501af72e6d84060e52bd93dfe 100644 (file)
--- a/src/backend/statistics/mcv.c
+++ b/src/backend/statistics/mcv.c
@@ -767,7 +767,7 @@ statext_mcv_serialize(MCVList *mcvlist, VacAttrStats **stats)
                values[dim][i] = PointerGetDatum(PG_DETOAST_DATUM(values[dim][i]));
 
                /* serialized length (uint32 length + data) */
-               len = VARSIZE_ANY_EXHDR(values[dim][i]);
+               len = VARSIZE_ANY_EXHDR(DatumGetPointer(values[dim][i]));
                info[dim].nbytes += sizeof(uint32); /* length */
                info[dim].nbytes += len;    /* value (no header) */
 

diff --git a/src/backend/tsearch/ts_selfuncs.c b/src/backend/tsearch/ts_selfuncs.c
index 0c1d2bc1109dae0245c0d25476e8439ead58bb4a..453a5e5c2ea064d02de0b3fce709412222a3e885 100644 (file)
--- a/src/backend/tsearch/ts_selfuncs.c
+++ b/src/backend/tsearch/ts_selfuncs.c
@@ -233,7 +233,7 @@ mcelem_tsquery_selec(TSQuery query, Datum *mcelem, int nmcelem,
         * The text Datums came from an array, so it cannot be compressed or
         * stored out-of-line -- it's safe to use VARSIZE_ANY*.
         */
-       Assert(!VARATT_IS_COMPRESSED(mcelem[i]) && !VARATT_IS_EXTERNAL(mcelem[i]));
+       Assert(!VARATT_IS_COMPRESSED(DatumGetPointer(mcelem[i])) && !VARATT_IS_EXTERNAL(DatumGetPointer(mcelem[i])));
        lookup[i].element = (text *) DatumGetPointer(mcelem[i]);
        lookup[i].frequency = numbers[i];
    }

diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c
index c1950792b5aeab870415afb3b9cb670d435e2175..9b56248cf0bee6189a6a760f953136a6667eb8a9 100644 (file)
--- a/src/backend/utils/adt/jsonb_gin.c
+++ b/src/backend/utils/adt/jsonb_gin.c
@@ -896,8 +896,8 @@ gin_extract_jsonb_query(PG_FUNCTION_ARGS)
                continue;
            /* We rely on the array elements not being toasted */
            entries[j++] = make_text_key(JGINFLAG_KEY,
-                                        VARDATA_ANY(key_datums[i]),
-                                        VARSIZE_ANY_EXHDR(key_datums[i]));
+                                        VARDATA_ANY(DatumGetPointer(key_datums[i])),
+                                        VARSIZE_ANY_EXHDR(DatumGetPointer(key_datums[i])));
        }
 
        *nentries = j;

diff --git a/src/backend/utils/adt/jsonb_op.c b/src/backend/utils/adt/jsonb_op.c
index fa5603f26e1d61782a45c86e8be5f11b0af7137f..51d38e321fb2fdbd939b24c59e4185a9a7945539 100644 (file)
--- a/src/backend/utils/adt/jsonb_op.c
+++ b/src/backend/utils/adt/jsonb_op.c
@@ -63,8 +63,8 @@ jsonb_exists_any(PG_FUNCTION_ARGS)
 
        strVal.type = jbvString;
        /* We rely on the array elements not being toasted */
-       strVal.val.string.val = VARDATA_ANY(key_datums[i]);
-       strVal.val.string.len = VARSIZE_ANY_EXHDR(key_datums[i]);
+       strVal.val.string.val = VARDATA_ANY(DatumGetPointer(key_datums[i]));
+       strVal.val.string.len = VARSIZE_ANY_EXHDR(DatumGetPointer(key_datums[i]));
 
        if (findJsonbValueFromContainer(&jb->root,
                                        JB_FOBJECT | JB_FARRAY,
@@ -96,8 +96,8 @@ jsonb_exists_all(PG_FUNCTION_ARGS)
 
        strVal.type = jbvString;
        /* We rely on the array elements not being toasted */
-       strVal.val.string.val = VARDATA_ANY(key_datums[i]);
-       strVal.val.string.len = VARSIZE_ANY_EXHDR(key_datums[i]);
+       strVal.val.string.val = VARDATA_ANY(DatumGetPointer(key_datums[i]));
+       strVal.val.string.len = VARSIZE_ANY_EXHDR(DatumGetPointer(key_datums[i]));
 
        if (findJsonbValueFromContainer(&jb->root,
                                        JB_FOBJECT | JB_FARRAY,

diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index bcb1720b6cde27cea71b68130195f9415c5f9e1d..370456408bfba41dd4004cd8a2c27eb361a2c519 100644 (file)
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -4766,8 +4766,8 @@ jsonb_delete_array(PG_FUNCTION_ARGS)
                    continue;
 
                /* We rely on the array elements not being toasted */
-               keyptr = VARDATA_ANY(keys_elems[i]);
-               keylen = VARSIZE_ANY_EXHDR(keys_elems[i]);
+               keyptr = VARDATA_ANY(DatumGetPointer(keys_elems[i]));
+               keylen = VARSIZE_ANY_EXHDR(DatumGetPointer(keys_elems[i]));
                if (keylen == v.val.string.len &&
                    memcmp(keyptr, v.val.string.val, keylen) == 0)
                {

diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index dbab24737ef1fa030ff62be707bab47de3aabdda..407041b14a177434169d69b8c0a6abe869a91378 100644 (file)
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -3074,8 +3074,8 @@ JsonItemFromDatum(Datum val, Oid typid, int32 typmod, JsonbValue *res)
        case TEXTOID:
        case VARCHAROID:
            res->type = jbvString;
-           res->val.string.val = VARDATA_ANY(val);
-           res->val.string.len = VARSIZE_ANY_EXHDR(val);
+           res->val.string.val = VARDATA_ANY(DatumGetPointer(val));
+           res->val.string.len = VARSIZE_ANY_EXHDR(DatumGetPointer(val));
            break;
        case DATEOID:
        case TIMEOID:

diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c
index 626b5513fe71a0aca7611caf8c64c60e259d0896..46f2ec0c29fbd682e219e1d19b12c2448850ae59 100644 (file)
--- a/src/backend/utils/adt/multirangetypes.c
+++ b/src/backend/utils/adt/multirangetypes.c
@@ -394,12 +394,13 @@ multirange_send(PG_FUNCTION_ARGS)
    for (int i = 0; i < range_count; i++)
    {
        Datum       range;
+       bytea      *outputbytes;
 
        range = RangeTypePGetDatum(ranges[i]);
-       range = PointerGetDatum(SendFunctionCall(&cache->typioproc, range));
+       outputbytes = SendFunctionCall(&cache->typioproc, range);
 
-       pq_sendint32(buf, VARSIZE(range) - VARHDRSZ);
-       pq_sendbytes(buf, VARDATA(range), VARSIZE(range) - VARHDRSZ);
+       pq_sendint32(buf, VARSIZE(outputbytes) - VARHDRSZ);
+       pq_sendbytes(buf, VARDATA(outputbytes), VARSIZE(outputbytes) - VARHDRSZ);
    }
 
    PG_RETURN_BYTEA_P(pq_endtypsend(buf));

diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
index 691679388df71c6e6212286906c86929bf98fda8..c83b239b3bb2893486359642dd87a5858bfa50a7 100644 (file)
--- a/src/backend/utils/adt/rangetypes.c
+++ b/src/backend/utils/adt/rangetypes.c
@@ -285,8 +285,7 @@ range_send(PG_FUNCTION_ARGS)
 
    if (RANGE_HAS_LBOUND(flags))
    {
-       Datum       bound = PointerGetDatum(SendFunctionCall(&cache->typioproc,
-                                                            lower.val));
+       bytea      *bound = SendFunctionCall(&cache->typioproc, lower.val);
        uint32      bound_len = VARSIZE(bound) - VARHDRSZ;
        char       *bound_data = VARDATA(bound);
 
@@ -296,8 +295,7 @@ range_send(PG_FUNCTION_ARGS)
 
    if (RANGE_HAS_UBOUND(flags))
    {
-       Datum       bound = PointerGetDatum(SendFunctionCall(&cache->typioproc,
-                                                            upper.val));
+       bytea      *bound = SendFunctionCall(&cache->typioproc, upper.val);
        uint32      bound_len = VARSIZE(bound) - VARHDRSZ;
        char       *bound_data = VARDATA(bound);
 

diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 1fa1275ca63b296f0ddd8478eb8504443864606e..0625da9532f6ccee736454d5dee66db46945d039 100644 (file)
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -329,8 +329,8 @@ tsvector_setweight_by_filter(PG_FUNCTION_ARGS)
        if (nulls[i])
            continue;
 
-       lex = VARDATA(dlexemes[i]);
-       lex_len = VARSIZE(dlexemes[i]) - VARHDRSZ;
+       lex = VARDATA(DatumGetPointer(dlexemes[i]));
+       lex_len = VARSIZE(DatumGetPointer(dlexemes[i])) - VARHDRSZ;
        lex_pos = tsvector_bsearch(tsout, lex, lex_len);
 
        if (lex_pos >= 0 && (j = POSDATALEN(tsout, entry + lex_pos)) != 0)
@@ -443,10 +443,10 @@ compare_text_lexemes(const void *va, const void *vb)
 {
    Datum       a = *((const Datum *) va);
    Datum       b = *((const Datum *) vb);
-   char       *alex = VARDATA_ANY(a);
-   int         alex_len = VARSIZE_ANY_EXHDR(a);
-   char       *blex = VARDATA_ANY(b);
-   int         blex_len = VARSIZE_ANY_EXHDR(b);
+   char       *alex = VARDATA_ANY(DatumGetPointer(a));
+   int         alex_len = VARSIZE_ANY_EXHDR(DatumGetPointer(a));
+   char       *blex = VARDATA_ANY(DatumGetPointer(b));
+   int         blex_len = VARSIZE_ANY_EXHDR(DatumGetPointer(b));
 
    return tsCompareString(alex, alex_len, blex, blex_len, false);
 }
@@ -605,8 +605,8 @@ tsvector_delete_arr(PG_FUNCTION_ARGS)
        if (nulls[i])
            continue;
 
-       lex = VARDATA(dlexemes[i]);
-       lex_len = VARSIZE(dlexemes[i]) - VARHDRSZ;
+       lex = VARDATA(DatumGetPointer(dlexemes[i]));
+       lex_len = VARSIZE(DatumGetPointer(dlexemes[i])) - VARHDRSZ;
        lex_pos = tsvector_bsearch(tsin, lex, lex_len);
 
        if (lex_pos >= 0)
@@ -770,7 +770,7 @@ array_to_tsvector(PG_FUNCTION_ARGS)
                    (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
                     errmsg("lexeme array may not contain nulls")));
 
-       if (VARSIZE(dlexemes[i]) - VARHDRSZ == 0)
+       if (VARSIZE(DatumGetPointer(dlexemes[i])) - VARHDRSZ == 0)
            ereport(ERROR,
                    (errcode(ERRCODE_ZERO_LENGTH_CHARACTER_STRING),
                     errmsg("lexeme array may not contain empty strings")));
@@ -786,7 +786,7 @@ array_to_tsvector(PG_FUNCTION_ARGS)
 
    /* Calculate space needed for surviving lexemes. */
    for (i = 0; i < nitems; i++)
-       datalen += VARSIZE(dlexemes[i]) - VARHDRSZ;
+       datalen += VARSIZE(DatumGetPointer(dlexemes[i])) - VARHDRSZ;
    tslen = CALCDATASIZE(nitems, datalen);
 
    /* Allocate and fill tsvector. */
@@ -798,8 +798,8 @@ array_to_tsvector(PG_FUNCTION_ARGS)
    cur = STRPTR(tsout);
    for (i = 0; i < nitems; i++)
    {
-       char       *lex = VARDATA(dlexemes[i]);
-       int         lex_len = VARSIZE(dlexemes[i]) - VARHDRSZ;
+       char       *lex = VARDATA(DatumGetPointer(dlexemes[i]));
+       int         lex_len = VARSIZE(DatumGetPointer(dlexemes[i])) - VARHDRSZ;
 
        memcpy(cur, lex, lex_len);
        arrout[i].haspos = 0;