database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Avoid treating nonrequired nbtree keys as required.

Browse Source 
Consistently prevent nbtree array advancement from treating a scankey as
required when operating in pstate.forcenonrequired mode.  Otherwise, we
risk a NULL pointer dereference.  This was possible in the path where
_bt_check_compare is called to recheck a tuple that advanced all of the
scan's arrays to matching values: its continuescan=false handling
expects _bt_advance_array_keys to have been called with a valid pstate,
but it'll always be NULL during sktrig_required=false calls (which is
how _bt_advance_array_keys must be called when pstate.forcenonrequired).

Oversight in commit 8a510275, which optimized nbtree search scan key
comparisons.

Author: Peter Geoghegan <pg@bowt.ie>
Reported-By: Mark Dilger <mark.dilger@enterprisedb.com>
Discussion: https://postgr.es/m/CAHgHdKsn2W=gPBmj7p6MjQFvxB+zZDBkwTSg0o3f5Hh8rkRrsA@mail.gmail.com
Discussion: https://postgr.es/m/CAH2-WzmodSE+gpTd1CRGU9ez8ytyyDS+Kns2r9NzgUp1s56kpw@mail.gmail.com
This commit is contained in:
Peter Geoghegan
2025-05-02 17:50:58 -04:00
parent 1681a70df3
commit 0f08df4068
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/access/nbtree/nbtutils.c
View File

@ -1826,7 +1826,7 @@ _bt_advance_array_keys(IndexScanDesc scan, BTReadPageState *pstate,
/* Recheck _bt_check_compare on behalf of caller */ /* Recheck _bt_check_compare on behalf of caller */
if (_bt_check_compare(scan, dir, tuple, tupnatts, tupdesc, false, if (_bt_check_compare(scan, dir, tuple, tupnatts, tupdesc, false,
false, &continuescan, !sktrig_required, &continuescan,
&nsktrig) && &nsktrig) &&
!so->scanBehind) !so->scanBehind)
{ {
@ -2799,8 +2799,6 @@ _bt_check_compare(IndexScanDesc scan, ScanDirection dir,
{ {
BTScanOpaque so = (BTScanOpaque) scan->opaque; BTScanOpaque so = (BTScanOpaque) scan->opaque;
Assert(!forcenonrequired || advancenonrequired);
*continuescan = true; /* default assumption */ *continuescan = true; /* default assumption */
for (; *ikey < so->numberOfKeys; (*ikey)++) for (; *ikey < so->numberOfKeys; (*ikey)++)