Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 2dbee9f

Browse files
committed
Fix overflow handling in plpgsql's integer FOR loops.
The test to exit the loop if the integer control value would overflow an int32 turns out not to work on some ICC versions, as it's dependent on the assumption that the compiler will execute the code as written rather than "optimize" it. ICC lacks any equivalent of gcc's -fwrapv switch, so it was optimizing on the assumption of no integer overflow, and that breaks this. Rewrite into a form that in fact does not do any overflowing computations. Per Tomas Vondra and buildfarm member fulmar. It's been like this for a long time, although it was not till we added a regression test case covering the behavior (in commit dd2243f) that the problem became apparent. Back-patch to all supported versions. Discussion: https://postgr.es/m/50562fdc-0876-9843-c883-15b8566c7511@2ndquadrant.com
1 parent 8f5ac44 commit 2dbee9f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/pl/plpgsql/src/pl_exec.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2566,13 +2566,13 @@ exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt)
25662566
*/
25672567
if (stmt->reverse)
25682568
{
2569-
if ((int32) (loop_value - step_value) > loop_value)
2569+
if (loop_value < (PG_INT32_MIN + step_value))
25702570
break;
25712571
loop_value -= step_value;
25722572
}
25732573
else
25742574
{
2575-
if ((int32) (loop_value + step_value) < loop_value)
2575+
if (loop_value > (PG_INT32_MAX - step_value))
25762576
break;
25772577
loop_value += step_value;
25782578
}

0 commit comments

Comments
 (0)