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

Commit85ec8bc

Browse files
committed
In hstore_plpython, avoid crashing when return value isn't a mapping.
Python 3 changed the behavior of PyMapping_Check(), breaking thetest in plpython_to_hstore() that verifies whether a function resultto be transformed is acceptable. A backwards-compatible fix is tofirst verify that the object doesn't pass PySequence_Check().Perhaps accidentally, our other uses of PyMapping_Check() alreadyfollow uses of PySequence_Check(), so that no other bugs werecreated by this change.Per bug #17908 from Alexander Lakhin. Back-patch to all supportedbranches.Dmitry Dolgov and Tom LaneDiscussion:https://postgr.es/m/17908-3f19a125d56a11d6@postgresql.org
1 parent1ed1b84 commit85ec8bc

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

‎contrib/hstore_plpython/expected/hstore_plpython.out‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ INFO: [('aa', 'bb'), ('cc', None)]
3232
2
3333
(1 row)
3434

35+
-- test that a non-mapping result is correctly rejected
36+
CREATE FUNCTION test1bad() RETURNS hstore
37+
LANGUAGE plpython3u
38+
TRANSFORM FOR TYPE hstore
39+
AS $$
40+
return "foo"
41+
$$;
42+
SELECT test1bad();
43+
ERROR: not a Python mapping
44+
CONTEXT: while creating return value
45+
PL/Python function "test1bad"
3546
-- test hstore[] -> python
3647
CREATE FUNCTION test1arr(val hstore[]) RETURNS int
3748
LANGUAGE plpython3u

‎contrib/hstore_plpython/hstore_plpython.c‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,13 @@ plpython_to_hstore(PG_FUNCTION_ARGS)
129129
HStore*volatileout;
130130

131131
dict= (PyObject*)PG_GETARG_POINTER(0);
132-
if (!PyMapping_Check(dict))
132+
133+
/*
134+
* As of Python 3, PyMapping_Check() is unreliable unless one first checks
135+
* that the object isn't a sequence. (Cleaner solutions exist, but not
136+
* before Python 3.10, which we're not prepared to require yet.)
137+
*/
138+
if (PySequence_Check(dict)|| !PyMapping_Check(dict))
133139
ereport(ERROR,
134140
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
135141
errmsg("not a Python mapping")));

‎contrib/hstore_plpython/sql/hstore_plpython.sql‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ $$;
2727
SELECT test1n('aa=>bb, cc=>NULL'::hstore);
2828

2929

30+
-- test that a non-mapping result is correctly rejected
31+
CREATEFUNCTIONtest1bad() RETURNS hstore
32+
LANGUAGE plpython3u
33+
TRANSFORM FOR TYPE hstore
34+
AS $$
35+
return"foo"
36+
$$;
37+
38+
SELECT test1bad();
39+
40+
3041
-- test hstore[] -> python
3142
CREATEFUNCTIONtest1arr(val hstore[]) RETURNSint
3243
LANGUAGE plpython3u

0 commit comments

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