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

Commit8c418fb

Browse files
committed
Fix volatile-safety issue in pltcl_SPI_execute_plan().
The "callargs" variable is modified within PG_TRY and then referencedwithin PG_CATCH, which is exactly the coding pattern we've now foundto be unsafe. Marking "callargs" volatile would be problematic becauseit is passed by reference to some Tcl functions, so fix the problemby not modifying it within PG_TRY. We can just postpone the free()till we exit the PG_TRY construct, as is already done elsewhere in thissame file.Also, fix failure to free(callargs) when exiting on too-many-argumentserror. This is only a minor memory leak, but a leak nonetheless.In passing, remove some unnecessary "volatile" markings in the samefunction. Those doubtless are there because gcc 2.95.3 whinged aboutthem, but we now know that its algorithm for complaining is many bricksshy of a load.This is certainly a live bug with compilers that optimize similarlyto current gcc, so back-patch to all active branches.
1 parent93d7706 commit8c418fb

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

‎src/pl/tcl/pltcl.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,9 +2156,9 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
21562156
intj;
21572157
Tcl_HashEntry*hashent;
21582158
pltcl_query_desc*qdesc;
2159-
constchar*volatilenulls=NULL;
2160-
CONST84char*volatilearrayname=NULL;
2161-
CONST84char*volatileloop_body=NULL;
2159+
constchar*nulls=NULL;
2160+
CONST84char*arrayname=NULL;
2161+
CONST84char*loop_body=NULL;
21622162
intcount=0;
21632163
intcallnargs;
21642164
CONST84char**callargs=NULL;
@@ -2288,6 +2288,8 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
22882288
if (i!=argc)
22892289
{
22902290
Tcl_SetResult(interp,usage,TCL_STATIC);
2291+
if (callargs)
2292+
ckfree((char*)callargs);
22912293
returnTCL_ERROR;
22922294
}
22932295

@@ -2326,10 +2328,6 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
23262328
}
23272329
}
23282330

2329-
if (callargs)
2330-
ckfree((char*)callargs);
2331-
callargs=NULL;
2332-
23332331
/************************************************************
23342332
* Execute the plan
23352333
************************************************************/
@@ -2356,6 +2354,9 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
23562354
}
23572355
PG_END_TRY();
23582356

2357+
if (callargs)
2358+
ckfree((char*)callargs);
2359+
23592360
returnmy_rc;
23602361
}
23612362

0 commit comments

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