Fixed CORE-1005.

FirebirdSQL · Nov 21, 2006 · 484bbf0 · 484bbf0
1 parent 40ad883
commit 484bbf0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/jrd/opt.cpp b/src/jrd/opt.cpp
@@ -7323,12 +7323,13 @@ static void set_direction(const jrd_nod* from_clause, jrd_nod* to_clause)
 /* all three clauses are allocated with thrice the number of arguments to
    leave room at the end for an ascending/descending and nulls placement flags,
    one for each field */
-	jrd_nod* const* from_ptr = from_clause->nod_arg + from_clause->nod_count;
-	jrd_nod** to_ptr = to_clause->nod_arg + to_clause->nod_count;
-	for (const jrd_nod* const* const end = from_ptr + from_clause->nod_count * 2;
-		from_ptr < end; from_ptr++)
+	jrd_nod* const* from_ptr = from_clause->nod_arg;
+	jrd_nod** to_ptr = to_clause->nod_arg;
+	for (const jrd_nod* const* const end = from_ptr + from_clause->nod_count;
+		from_ptr < end; from_ptr++, to_ptr++)
 	{
-		*to_ptr++ = *from_ptr;
+		*(to_ptr + to_clause->nod_count) = *(from_ptr + from_clause->nod_count);
+		*(to_ptr + to_clause->nod_count * 2) = *(from_ptr + from_clause->nod_count * 2);
 	}
 }