Fix out-of-array-bounds compiler warning

alvherre · alvherre · commit a19073845735 · 2015-03-16T22:35:45.000-03:00
Since the array length check is using a post-increment operator, the
compiler complains that there's a potential write to one element beyond
the end of the array.  This is not possible currently: the only path to
this function is through pg_get_object_address(), which already verifies
that the input array is no more than two elements in length.  Still, a
bug is a bug.

No idea why my compiler doesn't complain about this ...

Pointed out by Dead Rasheed and Peter Eisentraut
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
@@ -1428,7 +1428,7 @@ get_object_address_opf_member(ObjectType objtype,
 		typenames[i] = strVal(lfirst(cell));
 		typaddr = get_object_address_type(OBJECT_TYPE, cell, missing_ok);
 		typeoids[i] = typaddr.objectId;
-		if (i++ >= 2)
+		if (++i >= 2)
 			break;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1428,7 +1428,7 @@ get_object_address_opf_member(ObjectType objtype,`
`1428`	`1428`	`typenames[i] = strVal(lfirst(cell));`
`1429`	`1429`	`typaddr = get_object_address_type(OBJECT_TYPE, cell, missing_ok);`
`1430`	`1430`	`typeoids[i] = typaddr.objectId;`
`1431`		`- if (i++ >= 2)`
	`1431`	`+ if (++i >= 2)`
`1432`	`1432`	`break;`
`1433`	`1433`	`}`
`1434`	`1434`