Commit581a558

committed

Fix nested error handling in PG_FINALLY

We need to pop the error stack before running the user-suppliedPG_FINALLY code. Otherwise an error in the cleanup code would end upat the same sigsetjmp() invocation and result in an infinite errorhandling loop.Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://www.postgresql.org/message-id/flat/95a822c3-728b-af0e-d7e5-71890507ae0c%402ndquadrant.com

1 parenta0c9685 commit581a558Copy full SHA for 581a558

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3868,7 +3868,7 @@ xml_xmlnodetoxmltype(xmlNodePtr cur, PgXmlErrorContext *xmlerrcxt)`
`3868`	`3868`
`3869`	`3869`	`result=xmlBuffer_to_xmltype(buf);`
`3870`	`3870`	`}`
`3871`		`-PG_FINALLY()`
	`3871`	`+PG_FINALLY();`
`3872`	`3872`	`{`
`3873`	`3873`	`if (nodefree)`
`3874`	`3874`	`nodefree(cur_copy);`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -338,14 +338,16 @@ extern PGDLLIMPORT ErrorContextCallback *error_context_stack;`
`338`	`338`	`} \`
`339`	`339`	`else \`
`340`	`340`	`_do_rethrow = true; \`
`341`		`-{`
	`341`	`+{ \`
	`342`	`+PG_exception_stack = _save_exception_stack; \`
	`343`	`+error_context_stack = _save_context_stack`
`342`	`344`
`343`	`345`	`#definePG_END_TRY() \`
`344`	`346`	`} \`
`345`		`-PG_exception_stack = _save_exception_stack; \`
`346`		`-error_context_stack = _save_context_stack; \`
`347`	`347`	`if (_do_rethrow) \`
`348`	`348`	`PG_RE_THROW(); \`
	`349`	`+PG_exception_stack = _save_exception_stack; \`
	`350`	`+error_context_stack = _save_context_stack; \`
`349`	`351`	`} while (0)`
`350`	`352`
`351`	`353`	`/*`

Comments

(0)