Fix overflow handling in plpgsql's integer FOR loops.

tglsfdc · tglsfdc · commit 092401b14fa1 · 2018-03-17T15:38:15.000-04:00
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
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -38,6 +38,9 @@
 #include "utils/snapmgr.h"
 #include "utils/typcache.h"
 
+#define PG_INT32_MIN	(-0x7FFFFFFF-1)
+#define PG_INT32_MAX	(0x7FFFFFFF)
+
 
 static const char *const raise_skip_msg = "RAISE";
 
@@ -2030,13 +2033,13 @@ exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt)
 		 */
 		if (stmt->reverse)
 		{
-			if ((int32) (loop_value - step_value) > loop_value)
+			if (loop_value < (PG_INT32_MIN + step_value))
 				break;
 			loop_value -= step_value;
 		}
 		else
 		{
-			if ((int32) (loop_value + step_value) < loop_value)
+			if (loop_value > (PG_INT32_MAX - step_value))
 				break;
 			loop_value += step_value;
 		}

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@`
`38`	`38`	`#include "utils/snapmgr.h"`
`39`	`39`	`#include "utils/typcache.h"`
`40`	`40`
	`41`	`+#define PG_INT32_MIN (-0x7FFFFFFF-1)`
	`42`	`+#define PG_INT32_MAX (0x7FFFFFFF)`
	`43`	`+`
`41`	`44`
`42`	`45`	`static const char *const raise_skip_msg = "RAISE";`
`43`	`46`
`@@ -2030,13 +2033,13 @@ exec_stmt_fori(PLpgSQL_execstate estate, PLpgSQL_stmt_fori stmt)`
`2030`	`2033`	`*/`
`2031`	`2034`	`if (stmt->reverse)`
`2032`	`2035`	`{`
`2033`		`- if ((int32) (loop_value - step_value) > loop_value)`
	`2036`	`+ if (loop_value < (PG_INT32_MIN + step_value))`
`2034`	`2037`	`break;`
`2035`	`2038`	`loop_value -= step_value;`
`2036`	`2039`	`}`
`2037`	`2040`	`else`
`2038`	`2041`	`{`
`2039`		`- if ((int32) (loop_value + step_value) < loop_value)`
	`2042`	`+ if (loop_value > (PG_INT32_MAX - step_value))`
`2040`	`2043`	`break;`
`2041`	`2044`	`loop_value += step_value;`
`2042`	`2045`	`}`