diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-05-08 15:02:57 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-05-08 15:02:57 -0400 |
| commit | 935e77d527a018b652f247c7374c558871210db6 (patch) | |
| tree | a360b06cb0022d53f4b9a7a87cbc426561ab74f6 /src/backend/utils/adt | |
| parent | 2d5e7b4a912d55d90c01732d318b94e4ae47027b (diff) | |
Further patch rangetypes_selfuncs.c's statistics slot management.
Values in a STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM slot are float8,
not of the type of the column the statistics are for.
This bug is at least partly the fault of sloppy specification comments
for get_attstatsslot()/free_attstatsslot(): the type OID they want is that
of the stavalues entries, not of the underlying column. (I double-checked
other callers and they seem to get this right.) Adjust the comments to be
more correct.
Per buildfarm.
Security: CVE-2017-7484
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/rangetypes_selfuncs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/backend/utils/adt/rangetypes_selfuncs.c b/src/backend/utils/adt/rangetypes_selfuncs.c index b06b67010a4..965153108b9 100644 --- a/src/backend/utils/adt/rangetypes_selfuncs.c +++ b/src/backend/utils/adt/rangetypes_selfuncs.c @@ -20,6 +20,7 @@ #include "access/htup_details.h" #include "catalog/pg_operator.h" #include "catalog/pg_statistic.h" +#include "catalog/pg_type.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rangetypes.h" @@ -246,8 +247,9 @@ calc_rangesel(TypeCacheEntry *typcache, VariableStatData *vardata, /* Try to get fraction of empty ranges */ if (get_attstatsslot(vardata->statsTuple, - vardata->atttype, vardata->atttypmod, - STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM, InvalidOid, + FLOAT8OID, -1, + STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM, + InvalidOid, NULL, NULL, NULL, &numbers, &nnumbers)) @@ -255,7 +257,7 @@ calc_rangesel(TypeCacheEntry *typcache, VariableStatData *vardata, if (nnumbers != 1) elog(ERROR, "invalid empty fraction statistic"); /* shouldn't happen */ empty_frac = numbers[0]; - free_attstatsslot(vardata->atttype, NULL, 0, numbers, nnumbers); + free_attstatsslot(FLOAT8OID, NULL, 0, numbers, nnumbers); } else { @@ -424,7 +426,7 @@ calc_hist_selectivity(TypeCacheEntry *typcache, VariableStatData *vardata, { if (!(HeapTupleIsValid(vardata->statsTuple) && get_attstatsslot(vardata->statsTuple, - vardata->atttype, vardata->atttypmod, + FLOAT8OID, -1, STATISTIC_KIND_RANGE_LENGTH_HISTOGRAM, InvalidOid, NULL, @@ -438,7 +440,7 @@ calc_hist_selectivity(TypeCacheEntry *typcache, VariableStatData *vardata, /* check that it's a histogram, not just a dummy entry */ if (length_nhist < 2) { - free_attstatsslot(vardata->atttype, + free_attstatsslot(FLOAT8OID, length_hist_values, length_nhist, NULL, 0); free_attstatsslot(vardata->atttype, hist_values, nhist, NULL, 0); return -1.0; @@ -578,7 +580,7 @@ calc_hist_selectivity(TypeCacheEntry *typcache, VariableStatData *vardata, break; } - free_attstatsslot(vardata->atttype, + free_attstatsslot(FLOAT8OID, length_hist_values, length_nhist, NULL, 0); free_attstatsslot(vardata->atttype, hist_values, nhist, NULL, 0); |