NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit70d6226

committed

Use portal pinning in PL/Perl and PL/Python

PL/pgSQL "pins" internally generated portals so that user code cannotclose them by guessing their names. Add this functionality to PL/Perland PL/Python as well, preventing users from manually closing cursorscreated by spi_query and plpy.cursor, respectively. (PL/Tcl does notcurrently offer any cursor functionality.)

1 parent5115854 commit70d6226Copy full SHA for 70d6226

File tree

2 files changed

+16

-0

lines changed

src/pl
- plperl
  - plperl.c
- plpython
  - plpy_cursorobject.c

2 files changed

+16

-0

lines changed

`‎src/pl/plperl/plperl.c`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3406,6 +3406,8 @@ plperl_spi_query(char *query)`
`3406`	`3406`	`SPI_result_code_string(SPI_result));`
`3407`	`3407`	`cursor=cstr2sv(portal->name);`
`3408`	`3408`
	`3409`	`+PinPortal(portal);`
	`3410`	`+`
`3409`	`3411`	`/* Commit the inner transaction, return to outer xact context */`
`3410`	`3412`	`ReleaseCurrentSubTransaction();`
`3411`	`3413`	`MemoryContextSwitchTo(oldcontext);`
`@@ -3469,6 +3471,7 @@ plperl_spi_fetchrow(char *cursor)`
`3469`	`3471`	`SPI_cursor_fetch(p, true,1);`
`3470`	`3472`	`if (SPI_processed==0)`
`3471`	`3473`	`{`
	`3474`	`+UnpinPortal(p);`
`3472`	`3475`	`SPI_cursor_close(p);`
`3473`	`3476`	`row=&PL_sv_undef;`
`3474`	`3477`	`}`
`@@ -3520,7 +3523,10 @@ plperl_spi_cursor_close(char *cursor)`
`3520`	`3523`	`p=SPI_cursor_find(cursor);`
`3521`	`3524`
`3522`	`3525`	`if (p)`
	`3526`	`+{`
	`3527`	`+UnpinPortal(p);`
`3523`	`3528`	`SPI_cursor_close(p);`
	`3529`	`+}`
`3524`	`3530`	`}`
`3525`	`3531`
`3526`	`3532`	`SV*`
`@@ -3884,6 +3890,8 @@ plperl_spi_query_prepared(char query, int argc, SV *argv)`
`3884`	`3890`
`3885`	`3891`	`cursor=cstr2sv(portal->name);`
`3886`	`3892`
	`3893`	`+PinPortal(portal);`
	`3894`	`+`
`3887`	`3895`	`/* Commit the inner transaction, return to outer xact context */`
`3888`	`3896`	`ReleaseCurrentSubTransaction();`
`3889`	`3897`	`MemoryContextSwitchTo(oldcontext);`

`‎src/pl/plpython/plpy_cursorobject.c`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,8 @@ PLy_cursor_query(const char *query)`
`151`	`151`
`152`	`152`	`cursor->portalname=MemoryContextStrdup(cursor->mcxt,portal->name);`
`153`	`153`
	`154`	`+PinPortal(portal);`
	`155`	`+`
`154`	`156`	`PLy_spi_subtransaction_commit(oldcontext,oldowner);`
`155`	`157`	`}`
`156`	`158`	`PG_CATCH();`
`@@ -266,6 +268,8 @@ PLy_cursor_plan(PyObject ob, PyObject args)`
`266`	`268`
`267`	`269`	`cursor->portalname=MemoryContextStrdup(cursor->mcxt,portal->name);`
`268`	`270`
	`271`	`+PinPortal(portal);`
	`272`	`+`
`269`	`273`	`PLy_spi_subtransaction_commit(oldcontext,oldowner);`
`270`	`274`	`}`
`271`	`275`	`PG_CATCH();`
`@@ -317,7 +321,10 @@ PLy_cursor_dealloc(PyObject *arg)`
`317`	`321`	`portal=GetPortalByName(cursor->portalname);`
`318`	`322`
`319`	`323`	`if (PortalIsValid(portal))`
	`324`	`+{`
	`325`	`+UnpinPortal(portal);`
`320`	`326`	`SPI_cursor_close(portal);`
	`327`	`+}`
`321`	`328`	`cursor->closed= true;`
`322`	`329`	`}`
`323`	`330`	`if (cursor->mcxt)`
`@@ -508,6 +515,7 @@ PLy_cursor_close(PyObject self, PyObject unused)`
`508`	`515`	`returnNULL;`
`509`	`516`	`}`
`510`	`517`
	`518`	`+UnpinPortal(portal);`
`511`	`519`	`SPI_cursor_close(portal);`
`512`	`520`	`cursor->closed= true;`
`513`	`521`	`}`

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!

Commit70d6226

File tree

2 files changed

2 files changed

`‎src/pl/plperl/plperl.c`

`‎src/pl/plpython/plpy_cursorobject.c`

0 commit comments