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

Commit37f11c3

Browse files
committed
This patch addresses the problem mentioned in the "process crash
when a plpython function returns unicode" thread:http://archives.postgresql.org/pgsql-bugs/2005-06/msg00105.phpIn several places PL/Python was calling PyObject_Str() and thenPyString_AsString() without checking if the former had returnedNULL to indicate an error. PyString_AsString() doesn't expect aNULL argument, so passing one causes a segmentation fault. Thispatch adds checks for NULL and raises errors via PLy_elog(), whichprints details of the underlying Python exception. The patch alsoadds regression tests for these checks. All tests pass on mySolaris 9 box running HEAD and Python 2.4.1.In one place the patch doesn't call PLy_elog() because that couldcause infinite recursion; see the comment I added. I'm not surehow to test that particular case or whether it's even possible toget an error there: the value that the code should check is thePython exception type, so I wonder if a NULL value "shouldn'thappen." This patch converts NULL to "Unknown Exception" but Iwonder if an Assert() would be appropriate.The patch is against HEAD but the same changes should be appliedto earlier versions because they have the same problem. The patchmight not apply cleanly against earlier versions -- will the committertake care of little differences or should I submit different versionsof the patch?Michael Fuhr
1 parent75a64ee commit37f11c3

File tree

7 files changed

+100
-4
lines changed

7 files changed

+100
-4
lines changed

‎src/pl/plpython/expected/plpython_error.out

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,20 @@ SELECT valid_type('rick');
1919

2020
(1 row)
2121

22+
--
23+
-- Test Unicode error handling.
24+
--
25+
SELECT unicode_return_error();
26+
ERROR: plpython: function "unicode_return_error" could not create return value
27+
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
28+
INSERT INTO unicode_test (testvalue) VALUES ('test');
29+
ERROR: plpython: function "unicode_trigger_error" could not modify tuple
30+
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
31+
SELECT unicode_plan_error1();
32+
WARNING: plpython: in function unicode_plan_error1:
33+
DETAIL: plpy.Error: Unknown error in PLy_spi_execute_plan
34+
ERROR: plpython: function "unicode_plan_error1" could not execute plan
35+
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
36+
SELECT unicode_plan_error2();
37+
ERROR: plpython: function "unicode_plan_error2" could not execute plan
38+
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)

‎src/pl/plpython/expected/plpython_function.out

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,3 +267,25 @@ LANGUAGE plpythonu;
267267
CREATE OR REPLACE FUNCTION newline_crlf() RETURNS integer AS
268268
'x = 100\r\ny = 23\r\nreturn x + y\r\n'
269269
LANGUAGE plpythonu;
270+
--
271+
-- Unicode error handling
272+
--
273+
CREATE FUNCTION unicode_return_error() RETURNS text AS '
274+
return u"\\x80"
275+
' LANGUAGE plpythonu;
276+
CREATE FUNCTION unicode_trigger_error() RETURNS trigger AS '
277+
TD["new"]["testvalue"] = u"\\x80"
278+
return "MODIFY"
279+
' LANGUAGE plpythonu;
280+
CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test
281+
FOR EACH ROW EXECUTE PROCEDURE unicode_trigger_error();
282+
CREATE FUNCTION unicode_plan_error1() RETURNS text AS '
283+
plan = plpy.prepare("SELECT $1 AS testvalue", ["text"])
284+
rv = plpy.execute(plan, [u"\\x80"], 1)
285+
return rv[0]["testvalue"]
286+
' LANGUAGE plpythonu;
287+
CREATE FUNCTION unicode_plan_error2() RETURNS text AS '
288+
plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"])
289+
rv = plpy.execute(plan, u"\\x80", 1)
290+
return rv[0]["testvalue1"]
291+
' LANGUAGE plpythonu;

‎src/pl/plpython/expected/plpython_schema.out

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,6 @@ CREATE TABLE xsequences (
4141
sequence text not null
4242
) ;
4343
CREATE INDEX xsequences_pid_idx ON xsequences(pid) ;
44+
CREATE TABLE unicode_test (
45+
testvalue text NOT NULL
46+
);

‎src/pl/plpython/plpython.c

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
3030
*
3131
* IDENTIFICATION
32-
*$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.64 2005/07/05 18:15:51 momjian Exp $
32+
*$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.65 2005/07/10 04:56:55 momjian Exp $
3333
*
3434
*********************************************************************
3535
*/
@@ -517,6 +517,8 @@ PLy_modify_tuple(PLyProcedure * proc, PyObject * pltd, TriggerData *tdata,
517517
if (plval!=Py_None&& !tupdesc->attrs[atti]->attisdropped)
518518
{
519519
plstr=PyObject_Str(plval);
520+
if (!plstr)
521+
PLy_elog(ERROR,"function \"%s\" could not modify tuple",proc->proname);
520522
src=PyString_AsString(plstr);
521523

522524
modvalues[i]=FunctionCall3(&proc->result.out.r.atts[atti].typfunc,
@@ -774,6 +776,8 @@ PLy_function_handler(FunctionCallInfo fcinfo, PLyProcedure * proc)
774776
{
775777
fcinfo->isnull= false;
776778
plrv_so=PyObject_Str(plrv);
779+
if (!plrv_so)
780+
PLy_elog(ERROR,"function \"%s\" could not create return value",proc->proname);
777781
plrv_sc=PyString_AsString(plrv_so);
778782
rv=FunctionCall3(&proc->result.out.d.typfunc,
779783
PointerGetDatum(plrv_sc),
@@ -2019,7 +2023,9 @@ PLy_spi_execute_plan(PyObject * ob, PyObject * list, long limit)
20192023
char*sv;
20202024

20212025
PyObject*so=PyObject_Str(list);
2022-
2026+
if (!so)
2027+
PLy_elog(ERROR,"function \"%s\" could not execute plan",
2028+
PLy_procedure_name(PLy_curr_procedure));
20232029
sv=PyString_AsString(so);
20242030
PLy_exception_set(PLy_exc_spi_error,
20252031
"Expected sequence of %d arguments, got %d. %s",
@@ -2044,6 +2050,9 @@ PLy_spi_execute_plan(PyObject * ob, PyObject * list, long limit)
20442050
if (elem!=Py_None)
20452051
{
20462052
so=PyObject_Str(elem);
2053+
if (!so)
2054+
PLy_elog(ERROR,"function \"%s\" could not execute plan",
2055+
PLy_procedure_name(PLy_curr_procedure));
20472056
sv=PyString_AsString(so);
20482057

20492058
/*
@@ -2531,7 +2540,13 @@ PLy_traceback(int *xlevel)
25312540
else
25322541
vstr="Unknown";
25332542

2534-
estr=PyString_AsString(eob);
2543+
/*
2544+
* I'm not sure what to do if eob is NULL here -- we can't call
2545+
* PLy_elog because that function calls us, so we could end up
2546+
* with infinite recursion. I'm not even sure if eob could be
2547+
* NULL here -- would an Assert() be more appropriate?
2548+
*/
2549+
estr=eob ?PyString_AsString(eob) :"Unknown Exception";
25352550
xstr=PLy_printf("%s: %s",estr,vstr);
25362551

25372552
Py_DECREF(eob);

‎src/pl/plpython/sql/plpython_error.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,12 @@ SELECT invalid_type_uncaught('rick');
77
SELECT invalid_type_caught('rick');
88
SELECT invalid_type_reraised('rick');
99
SELECT valid_type('rick');
10+
11+
--
12+
-- Test Unicode error handling.
13+
--
14+
15+
SELECT unicode_return_error();
16+
INSERT INTO unicode_test (testvalue)VALUES ('test');
17+
SELECT unicode_plan_error1();
18+
SELECT unicode_plan_error2();

‎src/pl/plpython/sql/plpython_function.sql

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,3 +313,31 @@ LANGUAGE plpythonu;
313313
CREATE OR REPLACEFUNCTIONnewline_crlf() RETURNSintegerAS
314314
'x = 100\r\ny = 23\r\nreturn x + y\r\n'
315315
LANGUAGE plpythonu;
316+
317+
--
318+
-- Unicode error handling
319+
--
320+
321+
CREATEFUNCTIONunicode_return_error() RETURNStextAS'
322+
return u"\\x80"
323+
' LANGUAGE plpythonu;
324+
325+
CREATEFUNCTIONunicode_trigger_error() RETURNS triggerAS'
326+
TD["new"]["testvalue"] = u"\\x80"
327+
return "MODIFY"
328+
' LANGUAGE plpythonu;
329+
330+
CREATETRIGGERunicode_test_bi BEFORE INSERTON unicode_test
331+
FOR EACH ROW EXECUTE PROCEDURE unicode_trigger_error();
332+
333+
CREATEFUNCTIONunicode_plan_error1() RETURNStextAS'
334+
plan = plpy.prepare("SELECT $1 AS testvalue", ["text"])
335+
rv = plpy.execute(plan, [u"\\x80"], 1)
336+
return rv[0]["testvalue"]
337+
' LANGUAGE plpythonu;
338+
339+
CREATEFUNCTIONunicode_plan_error2() RETURNStextAS'
340+
plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"])
341+
rv = plpy.execute(plan, u"\\x80", 1)
342+
return rv[0]["testvalue1"]
343+
' LANGUAGE plpythonu;

‎src/pl/plpython/sql/plpython_schema.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,6 @@ CREATE TABLE xsequences (
3939
) ;
4040
CREATEINDEXxsequences_pid_idxON xsequences(pid) ;
4141

42-
42+
CREATETABLEunicode_test (
43+
testvaluetextNOT NULL
44+
);

0 commit comments

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