From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 24 Dec 2013 01:24:07 +0000 (-0500)
Subject: Fix portability issue in ordered-set patch.
X-Git-Tag: REL9_4_BETA1~760
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf63c641cae2063a0442d73d49af295301cec61b;p=postgresql

Fix portability issue in ordered-set patch.

Overly compact coding in makeOrderedSetArgs() led to a platform dependency:
if the compiler chose to execute the subexpressions in the wrong order,
list_length() might get applied to an already-modified List, giving a
value we didn't want.  Per buildfarm.
---

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 0249f5cdf3..daa21005f0 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -13385,6 +13385,7 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
 				   core_yyscan_t yyscanner)
 {
 	FunctionParameter *lastd = (FunctionParameter *) llast(directargs);
+	int			ndirectargs;
 
 	/* No restriction unless last direct arg is VARIADIC */
 	if (lastd->mode == FUNC_PARAM_VARIADIC)
@@ -13407,8 +13408,11 @@ makeOrderedSetArgs(List *directargs, List *orderedargs,
 		orderedargs = NIL;
 	}
 
+	/* don't merge into the next line, as list_concat changes directargs */
+	ndirectargs = list_length(directargs);
+
 	return list_make2(list_concat(directargs, orderedargs),
-					  makeInteger(list_length(directargs)));
+					  makeInteger(ndirectargs));
 }
 
 /* insertSelectOptions()