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

Commitdd9d78f

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 parentdf923be commitdd9d78f

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
@@ -2235,9 +2235,9 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
22352235
intj;
22362236
Tcl_HashEntry*hashent;
22372237
pltcl_query_desc*qdesc;
2238-
constchar*volatilenulls=NULL;
2239-
CONST84char*volatilearrayname=NULL;
2240-
CONST84char*volatileloop_body=NULL;
2238+
constchar*nulls=NULL;
2239+
CONST84char*arrayname=NULL;
2240+
CONST84char*loop_body=NULL;
22412241
intcount=0;
22422242
intcallnargs;
22432243
CONST84char**callargs=NULL;
@@ -2367,6 +2367,8 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
23672367
if (i!=argc)
23682368
{
23692369
Tcl_SetResult(interp,usage,TCL_STATIC);
2370+
if (callargs)
2371+
ckfree((char*)callargs);
23702372
returnTCL_ERROR;
23712373
}
23722374

@@ -2405,10 +2407,6 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
24052407
}
24062408
}
24072409

2408-
if (callargs)
2409-
ckfree((char*)callargs);
2410-
callargs=NULL;
2411-
24122410
/************************************************************
24132411
* Execute the plan
24142412
************************************************************/
@@ -2435,6 +2433,9 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
24352433
}
24362434
PG_END_TRY();
24372435

2436+
if (callargs)
2437+
ckfree((char*)callargs);
2438+
24382439
returnmy_rc;
24392440
}
24402441

0 commit comments

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