NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit7233099

committed

Put in some more safeguards against executing a division-by-zero.

Add dummy returns before every potential division-by-zero in int8.c,because apparently further "improvements" in gcc's optimizer haveenabled it to break functions that weren't broken before.Aurelien Jarno, via Martin Pitt

1 parent8acdb8b commit7233099Copy full SHA for 7233099

File tree

1 file changed

+17

-0

lines changed

src/backend/utils/adt
- int8.c

1 file changed

+17

-0

lines changed

`‎src/backend/utils/adt/int8.c‎`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -590,9 +590,13 @@ int8div(PG_FUNCTION_ARGS)`
`590`	`590`	`int64result;`
`591`	`591`
`592`	`592`	`if (arg2==0)`
	`593`	`+{`
`593`	`594`	`ereport(ERROR,`
`594`	`595`	`(errcode(ERRCODE_DIVISION_BY_ZERO),`
`595`	`596`	`errmsg("division by zero")));`
	`597`	`+/* ensure compiler realizes we mustn't reach the division (gcc bug) */`
	`598`	`+PG_RETURN_NULL();`
	`599`	`+}`
`596`	`600`
`597`	`601`	`result=arg1 /arg2;`
`598`	`602`
`@@ -637,9 +641,14 @@ int8mod(PG_FUNCTION_ARGS)`
`637`	`641`	`int64arg2=PG_GETARG_INT64(1);`
`638`	`642`
`639`	`643`	`if (arg2==0)`
	`644`	`+{`
`640`	`645`	`ereport(ERROR,`
`641`	`646`	`(errcode(ERRCODE_DIVISION_BY_ZERO),`
`642`	`647`	`errmsg("division by zero")));`
	`648`	`+/* ensure compiler realizes we mustn't reach the division (gcc bug) */`
	`649`	`+PG_RETURN_NULL();`
	`650`	`+}`
	`651`	`+`
`643`	`652`	`/* No overflow is possible */`
`644`	`653`
`645`	`654`	`PG_RETURN_INT64(arg1 %arg2);`
`@@ -813,9 +822,13 @@ int84div(PG_FUNCTION_ARGS)`
`813`	`822`	`int64result;`
`814`	`823`
`815`	`824`	`if (arg2==0)`
	`825`	`+{`
`816`	`826`	`ereport(ERROR,`
`817`	`827`	`(errcode(ERRCODE_DIVISION_BY_ZERO),`
`818`	`828`	`errmsg("division by zero")));`
	`829`	`+/* ensure compiler realizes we mustn't reach the division (gcc bug) */`
	`830`	`+PG_RETURN_NULL();`
	`831`	`+}`
`819`	`832`
`820`	`833`	`result=arg1 /arg2;`
`821`	`834`
`@@ -997,9 +1010,13 @@ int82div(PG_FUNCTION_ARGS)`
`997`	`1010`	`int64result;`
`998`	`1011`
`999`	`1012`	`if (arg2==0)`
	`1013`	`+{`
`1000`	`1014`	`ereport(ERROR,`
`1001`	`1015`	`(errcode(ERRCODE_DIVISION_BY_ZERO),`
`1002`	`1016`	`errmsg("division by zero")));`
	`1017`	`+/* ensure compiler realizes we mustn't reach the division (gcc bug) */`
	`1018`	`+PG_RETURN_NULL();`
	`1019`	`+}`
`1003`	`1020`
`1004`	`1021`	`result=arg1 /arg2;`
`1005`	`1022`

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!

Commit7233099

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/int8.c‎`

0 commit comments