Commitcac7332

committed

deflist_to_tuplestore dumped core on an option with no value.

Make it return NULL for the option_value, instead.Per report from Frank van Vugt. Back-patch to 8.4 where this code wasadded.

1 parent4de174d commitcac7332Copy full SHA for cac7332

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ deflist_to_tuplestore(ReturnSetInfo rsinfo, List options)`
`260`	`260`	`TupleDesctupdesc;`
`261`	`261`	`Tuplestorestate*tupstore;`
`262`	`262`	`Datumvalues[2];`
`263`		`-boolnulls[2]= {0};`
	`263`	`+boolnulls[2];`
`264`	`264`	`MemoryContextper_query_ctx;`
`265`	`265`	`MemoryContextoldcontext;`
`266`	`266`
`@@ -292,7 +292,17 @@ deflist_to_tuplestore(ReturnSetInfo rsinfo, List options)`
`292`	`292`	`DefElem*def=lfirst(cell);`
`293`	`293`
`294`	`294`	`values[0]=CStringGetTextDatum(def->defname);`
`295`		`-values[1]=CStringGetTextDatum(((Value*)def->arg)->val.str);`
	`295`	`+nulls[0]= false;`
	`296`	`+if (def->arg)`
	`297`	`+{`
	`298`	`+values[1]=CStringGetTextDatum(((Value*) (def->arg))->val.str);`
	`299`	`+nulls[1]= false;`
	`300`	`+}`
	`301`	`+else`
	`302`	`+{`
	`303`	`+values[1]= (Datum)0;`
	`304`	`+nulls[1]= true;`
	`305`	`+}`
`296`	`306`	`tuplestore_putvalues(tupstore,tupdesc,values,nulls);`
`297`	`307`	`}`
`298`	`308`

Comments

(0)