NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8557a6f

committed

Catch invalid typlens in a couple of places

Rearrange the logic in record_image_cmp() and datum_image_eq() toerror out on unexpected typlens (either not supported there orcompletely invalid due to corruption). Barring corruption, this isnot possible today but it seems more future-proof and robust to fixthis.Reported-by: Peter Geoghegan <pg@bowt.ie>

1 parentdb27b60 commit8557a6fCopy full SHA for 8557a6f

File tree

2 files changed

+25

-21

lines changed

src/backend/utils/adt
- datum.c
- rowtypes.c

2 files changed

+25

-21

lines changed

`‎src/backend/utils/adt/datum.c`

Lines changed: 12 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,17 @@ datum_image_eq(Datum value1, Datum value2, bool typByVal, int typLen)`
`265`	`265`	`{`
`266`	`266`	`boolresult= true;`
`267`	`267`
`268`		`-if (typLen==-1)`
	`268`	`+if (typByVal)`
	`269`	`+{`
	`270`	`+result= (value1==value2);`
	`271`	`+}`
	`272`	`+elseif (typLen>0)`
	`273`	`+{`
	`274`	`+result= (memcmp(DatumGetPointer(value1),`
	`275`	`+DatumGetPointer(value2),`
	`276`	`+typLen)==0);`
	`277`	`+}`
	`278`	`+elseif (typLen==-1)`
`269`	`279`	`{`
`270`	`280`	`Sizelen1,`
`271`	`281`	`len2;`
`@@ -294,16 +304,8 @@ datum_image_eq(Datum value1, Datum value2, bool typByVal, int typLen)`
`294`	`304`	`pfree(arg2val);`
`295`	`305`	`}`
`296`	`306`	`}`
`297`		`-elseif (typByVal)`
`298`		`-{`
`299`		`-result= (value1==value2);`
`300`		`-}`
`301`	`307`	`else`
`302`		`-{`
`303`		`-result= (memcmp(DatumGetPointer(value1),`
`304`		`-DatumGetPointer(value2),`
`305`		`-typLen)==0);`
`306`		`-}`
	`308`	`+elog(ERROR,"unexpected typLen: %d",typLen);`
`307`	`309`
`308`	`310`	`returnresult;`
`309`	`311`	`}`

`‎src/backend/utils/adt/rowtypes.c`

Lines changed: 13 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1443,7 +1443,18 @@ record_image_cmp(FunctionCallInfo fcinfo)`
`1443`	`1443`	`}`
`1444`	`1444`
`1445`	`1445`	`/* Compare the pair of elements */`
`1446`		`-if (att1->attlen==-1)`
	`1446`	`+if (att1->attbyval)`
	`1447`	`+{`
	`1448`	`+if (values1[i1]!=values2[i2])`
	`1449`	`+cmpresult= (values1[i1]<values2[i2]) ?-1 :1;`
	`1450`	`+}`
	`1451`	`+elseif (att1->attlen>0)`
	`1452`	`+{`
	`1453`	`+cmpresult=memcmp(DatumGetPointer(values1[i1]),`
	`1454`	`+DatumGetPointer(values2[i2]),`
	`1455`	`+att1->attlen);`
	`1456`	`+}`
	`1457`	`+elseif (att1->attlen==-1)`
`1447`	`1458`	`{`
`1448`	`1459`	`Sizelen1,`
`1449`	`1460`	`len2;`
`@@ -1466,17 +1477,8 @@ record_image_cmp(FunctionCallInfo fcinfo)`
`1466`	`1477`	`if ((Pointer)arg2val!= (Pointer)values2[i2])`
`1467`	`1478`	`pfree(arg2val);`
`1468`	`1479`	`}`
`1469`		`-elseif (att1->attbyval)`
`1470`		`-{`
`1471`		`-if (values1[i1]!=values2[i2])`
`1472`		`-cmpresult= (values1[i1]<values2[i2]) ?-1 :1;`
`1473`		`-}`
`1474`	`1480`	`else`
`1475`		`-{`
`1476`		`-cmpresult=memcmp(DatumGetPointer(values1[i1]),`
`1477`		`-DatumGetPointer(values2[i2]),`
`1478`		`-att1->attlen);`
`1479`		`-}`
	`1481`	`+elog(ERROR,"unexpected attlen: %d",att1->attlen);`
`1480`	`1482`
`1481`	`1483`	`if (cmpresult<0)`
`1482`	`1484`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8557a6f

File tree

2 files changed

2 files changed

`‎src/backend/utils/adt/datum.c`

`‎src/backend/utils/adt/rowtypes.c`

0 commit comments