NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitdda633a

committed

Fix pl/tcl's handling of errors from Tcl_ListObjGetElements().

In a procedure or function returning tuple, we use that function toparse the Tcl script's result, which is supposed to be a Tcl list.If it isn't, you get an error. Commit26abb50 incautiouslysupposed that we could use throw_tcl_error() to report such an error.That doesn't actually work, because low-level functions likeTcl_ListObjGetElements() don't fill Tcl's errorInfo variable.The result is either a null-pointer-dereference crash or emissionof misleading context information describing the previous Tcl error.Back off to just reporting the interpreter's result string, andimprove throw_tcl_error()'s comment to explain when to use it.Also, although the similar code in pltcl_trigger_handler() avoidedthis mistake, it was using a fairly confusing wording of theerror message. Improve that while we're here.Per report from A. Kozhemyakin. Back-patch to all supportedbranches.Erik Wienhold and Tom LaneDiscussion:https://postgr.es/m/6a2a1c40-2b2c-4a33-8b72-243c0766fcda@postgrespro.ru

1 parent1d5c5ae commitdda633aCopy full SHA for dda633a

File tree

3 files changed

+28

-2

lines changed

src/pl/tcl
- expected
  - pltcl_call.out
- pltcl.c
- sql
  - pltcl_call.sql

3 files changed

+28

-2

lines changed

`‎src/pl/tcl/expected/pltcl_call.out`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,14 @@ CALL test_proc6(2, 3, 4);`
`49`	`49`	`6 \| 8`
`50`	`50`	`(1 row)`
`51`	`51`
	`52`	`+-- syntax error in result tuple`
	`53`	`+CREATE PROCEDURE test_proc10(INOUT a text)`
	`54`	`+LANGUAGE pltcl`
	`55`	`+AS $$`
	`56`	`+return [list a {$a + $a}])`
	`57`	`+$$;`
	`58`	`+CALL test_proc10('abc');`
	`59`	`+ERROR: could not parse function return value: list element in braces followed by ")" instead of space`
`52`	`60`	`DROP PROCEDURE test_proc1;`
`53`	`61`	`DROP PROCEDURE test_proc2;`
`54`	`62`	`DROP PROCEDURE test_proc3;`

`‎src/pl/tcl/pltcl.c`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1022,7 +1022,10 @@ pltcl_func_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,`
`1022`	`1022`	`/* Convert function result to tuple */`
`1023`	`1023`	`resultObj=Tcl_GetObjResult(interp);`
`1024`	`1024`	`if (Tcl_ListObjGetElements(interp,resultObj,&resultObjc,&resultObjv)==TCL_ERROR)`
`1025`		`-throw_tcl_error(interp,prodesc->user_proname);`
	`1025`	`+ereport(ERROR,`
	`1026`	`+(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),`
	`1027`	`+errmsg("could not parse function return value: %s",`
	`1028`	`+utf_u2e(Tcl_GetStringResult(interp)))));`
`1026`	`1029`
`1027`	`1030`	`tup=pltcl_build_tuple_result(interp,resultObjv,resultObjc,`
`1028`	`1031`	`call_state);`
`@@ -1289,7 +1292,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,`
`1289`	`1292`	`&result_Objc,&result_Objv)!=TCL_OK)`
`1290`	`1293`	`ereport(ERROR,`
`1291`	`1294`	`(errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED),`
`1292`		`-errmsg("could notsplitreturn value from trigger: %s",`
	`1295`	`+errmsg("could notparse triggerreturn value: %s",`
`1293`	`1296`	`utf_u2e(Tcl_GetStringResult(interp)))));`
`1294`	`1297`
`1295`	`1298`	`/* Convert function result to tuple */`
`@@ -1352,6 +1355,10 @@ pltcl_event_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,`
`1352`	`1355`
`1353`	`1356`	`/**********************************************************************`
`1354`	`1357`	`* throw_tcl_error- ereport an error returned from the Tcl interpreter`
	`1358`	`+ *`
	`1359`	`+ * Caution: use this only to report errors returned by Tcl_EvalObjEx() or`
	`1360`	`+ * other variants of Tcl_Eval(). Other functions may not fill "errorInfo",`
	`1361`	`+ * so it could be unset or even contain details from some previous error.`
`1355`	`1362`	`**********************************************************************/`
`1356`	`1363`	`staticvoid`
`1357`	`1364`	`throw_tcl_error(Tcl_Interpinterp,constcharproname)`

`‎src/pl/tcl/sql/pltcl_call.sql`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,17 @@ $$;`
`52`	`52`	`CALL test_proc6(2,3,4);`
`53`	`53`
`54`	`54`
	`55`	`+-- syntax error in result tuple`
	`56`	`+`
	`57`	`+CREATE PROCEDURE test_proc10(INOUT atext)`
	`58`	`+LANGUAGE pltcl`
	`59`	`+AS $$`
	`60`	`+return [list a {$a+ $a}])`
	`61`	`+$$;`
	`62`	`+`
	`63`	`+CALL test_proc10('abc');`
	`64`	`+`
	`65`	`+`
`55`	`66`	`DROP PROCEDURE test_proc1;`
`56`	`67`	`DROP PROCEDURE test_proc2;`
`57`	`68`	`DROP PROCEDURE test_proc3;`

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!

Commitdda633a

File tree

3 files changed

3 files changed

`‎src/pl/tcl/expected/pltcl_call.out`

`‎src/pl/tcl/pltcl.c`

`‎src/pl/tcl/sql/pltcl_call.sql`

0 commit comments