Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1488dee

Browse files
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 parentd0c11ea commit1488dee

File tree

3 files changed

+28
-2
lines changed

3 files changed

+28
-2
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ END
6666
$$;
6767
NOTICE: a: 10
6868
NOTICE: _a: 10, _b: 20
69+
-- syntax error in result tuple
70+
CREATE PROCEDURE test_proc10(INOUT a text)
71+
LANGUAGE pltcl
72+
AS $$
73+
return [list a {$a + $a}])
74+
$$;
75+
CALL test_proc10('abc');
76+
ERROR: could not parse function return value: list element in braces followed by ")" instead of space
6977
DROP PROCEDURE test_proc1;
7078
DROP PROCEDURE test_proc2;
7179
DROP PROCEDURE test_proc3;

‎src/pl/tcl/pltcl.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,10 @@ pltcl_func_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
10201020
/* Convert function result to tuple */
10211021
resultObj=Tcl_GetObjResult(interp);
10221022
if (Tcl_ListObjGetElements(interp,resultObj,&resultObjc,&resultObjv)==TCL_ERROR)
1023-
throw_tcl_error(interp,prodesc->user_proname);
1023+
ereport(ERROR,
1024+
(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
1025+
errmsg("could not parse function return value: %s",
1026+
utf_u2e(Tcl_GetStringResult(interp)))));
10241027

10251028
tup=pltcl_build_tuple_result(interp,resultObjv,resultObjc,
10261029
call_state);
@@ -1287,7 +1290,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
12871290
&result_Objc,&result_Objv)!=TCL_OK)
12881291
ereport(ERROR,
12891292
(errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED),
1290-
errmsg("could notsplitreturn value from trigger: %s",
1293+
errmsg("could notparse triggerreturn value: %s",
12911294
utf_u2e(Tcl_GetStringResult(interp)))));
12921295

12931296
/* Convert function result to tuple */
@@ -1350,6 +1353,10 @@ pltcl_event_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
13501353

13511354
/**********************************************************************
13521355
* throw_tcl_error- ereport an error returned from the Tcl interpreter
1356+
*
1357+
* Caution: use this only to report errors returned by Tcl_EvalObjEx() or
1358+
* other variants of Tcl_Eval(). Other functions may not fill "errorInfo",
1359+
* so it could be unset or even contain details from some previous error.
13531360
**********************************************************************/
13541361
staticvoid
13551362
throw_tcl_error(Tcl_Interp*interp,constchar*proname)

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,17 @@ END
7171
$$;
7272

7373

74+
-- syntax error in result tuple
75+
76+
CREATE PROCEDURE test_proc10(INOUT atext)
77+
LANGUAGE pltcl
78+
AS $$
79+
return [list a {$a+ $a}])
80+
$$;
81+
82+
CALL test_proc10('abc');
83+
84+
7485
DROP PROCEDURE test_proc1;
7586
DROP PROCEDURE test_proc2;
7687
DROP PROCEDURE test_proc3;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp