NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit00ac25a

committed

Tighten test_predtest's input checks, and improve error messages.

test_predtest() neglected to consider the possibility thatSPI_plan_get_cached_plan would return NULL. This led to a coredump if the input (incorrectly) contains more than one SQLcommand.While here, let's expend more than zero effort on the errormessage for this case and nearby ones.Per (half of) bug #18483 from Alexander Kozhemyakin.Back-patch to all supported branches, not because this isvery significant (it's merely test scaffolding) but to makeour world a bit safer for fuzz testing.Discussion:https://postgr.es/m/18483-30bfff42de238000@postgresql.org

1 parent7ed8ce8 commit00ac25aCopy full SHA for 00ac25a

File tree

1 file changed

-4

lines changed

src/test/modules/test_predtest
- test_predtest.c

1 file changed

-4

lines changed

`‎src/test/modules/test_predtest/test_predtest.c‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ test_predtest(PG_FUNCTION_ARGS)`
`74`	`74`	`if (tupdesc->natts!=2\|\|`
`75`	`75`	`TupleDescAttr(tupdesc,0)->atttypid!=BOOLOID\|\|`
`76`	`76`	`TupleDescAttr(tupdesc,1)->atttypid!=BOOLOID)`
`77`		`-elog(ERROR,"query must yield two boolean columns");`
	`77`	`+elog(ERROR,"test_predtestquery must yield two boolean columns");`
`78`	`78`
`79`	`79`	`s_i_holds=w_i_holds=s_r_holds=w_r_holds= true;`
`80`	`80`	`for (i=0;i<SPI_processed;i++)`
`@@ -140,11 +140,11 @@ test_predtest(PG_FUNCTION_ARGS)`
`140`	`140`	`*/`
`141`	`141`	`cplan=SPI_plan_get_cached_plan(spiplan);`
`142`	`142`
`143`		`-if (list_length(cplan->stmt_list)!=1)`
`144`		`-elog(ERROR,"failed to decipher query plan");`
	`143`	`+if (cplan==NULL\|\|list_length(cplan->stmt_list)!=1)`
	`144`	`+elog(ERROR,"test_predtest query string must contain exactly one query");`
`145`	`145`	`stmt=linitial_node(PlannedStmt,cplan->stmt_list);`
`146`	`146`	`if (stmt->commandType!=CMD_SELECT)`
`147`		`-elog(ERROR,"failed to decipher query plan");`
	`147`	`+elog(ERROR,"test_predtest query must be a SELECT");`
`148`	`148`	`plan=stmt->planTree;`
`149`	`149`	`Assert(list_length(plan->targetlist) >=2);`
`150`	`150`	`clause1=linitial_node(TargetEntry,plan->targetlist)->expr;`

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!

Commit00ac25a

File tree

1 file changed

1 file changed

`‎src/test/modules/test_predtest/test_predtest.c‎`

0 commit comments