NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit465ed56

committed

Fix core dump when pltcl_elog is called with wrong number of parameters,

per report from Ian Harding.

1 parente24977f commit465ed56Copy full SHA for 465ed56

File tree

1 file changed

+15

-15

lines changed

src/pl/tcl
- pltcl.c

1 file changed

+15

-15

lines changed

`‎src/pl/tcl/pltcl.c‎`

Lines changed: 15 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`* ENHANCEMENTS, OR MODIFICATIONS.`
`32`	`32`	`*`
`33`	`33`	`* IDENTIFICATION`
`34`		`- * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.68 2002/12/30 22:10:54 tgl Exp $`
	`34`	`+ * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.69 2003/02/06 17:02:11 tgl Exp $`
`35`	`35`	`*`
`36`	`36`	`**********************************************************************/`
`37`	`37`
`@@ -1255,7 +1255,7 @@ static int`
`1255`	`1255`	`pltcl_elog(ClientDatacdata,Tcl_Interp*interp,`
`1256`	`1256`	`intargc,CONST84char*argv[])`
`1257`	`1257`	`{`
`1258`		`-intlevel;`
	`1258`	`+volatileintlevel;`
`1259`	`1259`	`sigjmp_bufsave_restart;`
`1260`	`1260`
`1261`	`1261`	`/************************************************************`
`@@ -1264,18 +1264,6 @@ pltcl_elog(ClientData cdata, Tcl_Interp *interp,`
`1264`	`1264`	`if (pltcl_restart_in_progress)`
`1265`	`1265`	`returnTCL_ERROR;`
`1266`	`1266`
`1267`		`-/************************************************************`
`1268`		`- * Catch the restart longjmp and begin a controlled`
`1269`		`- * return though all interpreter levels if it happens`
`1270`		`- ************************************************************/`
`1271`		`-memcpy(&save_restart,&Warn_restart,sizeof(save_restart));`
`1272`		`-if (sigsetjmp(Warn_restart,1)!=0)`
`1273`		`-{`
`1274`		`-memcpy(&Warn_restart,&save_restart,sizeof(Warn_restart));`
`1275`		`-pltcl_restart_in_progress=1;`
`1276`		`-returnTCL_ERROR;`
`1277`		`-}`
`1278`		`-`
`1279`	`1267`	`if (argc!=3)`
`1280`	`1268`	`{`
`1281`	`1269`	`Tcl_SetResult(interp,"syntax error - 'elog level msg'",`
`@@ -1301,17 +1289,29 @@ pltcl_elog(ClientData cdata, Tcl_Interp *interp,`
`1301`	`1289`	`{`
`1302`	`1290`	`Tcl_AppendResult(interp,"Unknown elog level '",argv[1],`
`1303`	`1291`	`"'",NULL);`
	`1292`	`+returnTCL_ERROR;`
	`1293`	`+}`
	`1294`	`+`
	`1295`	`+/************************************************************`
	`1296`	`+ * Catch the longjmp from elog() and begin a controlled`
	`1297`	`+ * return though all interpreter levels if it happens`
	`1298`	`+ ************************************************************/`
	`1299`	`+memcpy(&save_restart,&Warn_restart,sizeof(save_restart));`
	`1300`	`+if (sigsetjmp(Warn_restart,1)!=0)`
	`1301`	`+{`
`1304`	`1302`	`memcpy(&Warn_restart,&save_restart,sizeof(Warn_restart));`
	`1303`	`+pltcl_restart_in_progress=1;`
`1305`	`1304`	`returnTCL_ERROR;`
`1306`	`1305`	`}`
`1307`	`1306`
`1308`	`1307`	`/************************************************************`
`1309`	`1308`	`* Call elog(), restore the original restart address`
`1310`		`- * and return to the caller (ifnot catched)`
	`1309`	`+ * and return to the caller (ifno longjmp)`
`1311`	`1310`	`************************************************************/`
`1312`	`1311`	`UTF_BEGIN;`
`1313`	`1312`	`elog(level,"%s",UTF_U2E(argv[2]));`
`1314`	`1313`	`UTF_END;`
	`1314`	`+`
`1315`	`1315`	`memcpy(&Warn_restart,&save_restart,sizeof(Warn_restart));`
`1316`	`1316`	`returnTCL_OK;`
`1317`	`1317`	`}`

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!

Commit465ed56

File tree

1 file changed

1 file changed

`‎src/pl/tcl/pltcl.c‎`

0 commit comments