Avoid pointer arithmetic on void* in test/integration/rallocx.c

glandium · Jason Evans · commit 3a730dfd5062 · 2014-05-27T15:26:28.000-07:00
diff --git a/test/integration/rallocx.c b/test/integration/rallocx.c
@@ -95,7 +95,8 @@ TEST_BEGIN(test_zero)
 				    "Expected zeroed memory");
 			}
 			if (psz != qsz) {
-				memset(q+psz, FILL_BYTE, qsz-psz);
+				memset((void *)(uintptr_t)q+psz, FILL_BYTE,
+				    qsz-psz);
 				psz = qsz;
 			}
 			p = q;
@@ -159,8 +160,9 @@ TEST_BEGIN(test_lg_align_and_zero)
 		} else {
 			assert_false(validate_fill(q, 0, 0, MAX_VALIDATE),
 			    "Expected zeroed memory");
-			assert_false(validate_fill(q+sz-MAX_VALIDATE, 0, 0,
-			    MAX_VALIDATE), "Expected zeroed memory");
+			assert_false(validate_fill(
+			    (void *)(uintptr_t)q+sz-MAX_VALIDATE,
+			    0, 0, MAX_VALIDATE), "Expected zeroed memory");
 		}
 		p = q;
 	}

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,8 @@ TEST_BEGIN(test_zero)`
`95`	`95`	`"Expected zeroed memory");`
`96`	`96`	`}`
`97`	`97`	`if (psz != qsz) {`
`98`		`- memset(q+psz, FILL_BYTE, qsz-psz);`
	`98`	`+ memset((void *)(uintptr_t)q+psz, FILL_BYTE,`
	`99`	`+ qsz-psz);`
`99`	`100`	`psz = qsz;`
`100`	`101`	`}`
`101`	`102`	`p = q;`
`@@ -159,8 +160,9 @@ TEST_BEGIN(test_lg_align_and_zero)`
`159`	`160`	`} else {`
`160`	`161`	`assert_false(validate_fill(q, 0, 0, MAX_VALIDATE),`
`161`	`162`	`"Expected zeroed memory");`
`162`		`- assert_false(validate_fill(q+sz-MAX_VALIDATE, 0, 0,`
`163`		`- MAX_VALIDATE), "Expected zeroed memory");`
	`163`	`+ assert_false(validate_fill(`
	`164`	`+ (void *)(uintptr_t)q+sz-MAX_VALIDATE,`
	`165`	`+ 0, 0, MAX_VALIDATE), "Expected zeroed memory");`
`164`	`166`	`}`
`165`	`167`	`p = q;`
`166`	`168`	`}`