OSO/TinyCC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VLA bcheck works via bound alloca; add test, remove warning

Browse Source
This commit is contained in:
Joe Soroka
2011-04-06 15:27:45 -07:00
parent 810aca9e68
commit c94f80502e
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tccgen.c
View File

@ -5213,9 +5213,7 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
sec = NULL; sec = NULL;
#ifdef CONFIG_TCC_BCHECK #ifdef CONFIG_TCC_BCHECK
if (tcc_state->do_bounds_check && (type->t & VT_ARRAY)) { if (tcc_state->do_bounds_check && (type->t & VT_ARRAY)) {
if (type->t & VT_VLA) if (!(type->t & VT_VLA))
warning("Array bound check don't work for VLA");
else
loc--; loc--;
} }
#endif #endif

34
tests/tcctest.c
View File

@ -2070,11 +2070,17 @@ void alloca_test()
/* Test alloca embedded in a larger expression */ /* Test alloca embedded in a larger expression */
printf("alloca: %s\n", strcpy(alloca(strlen(demo)+1),demo) ); printf("alloca: %s\n", strcpy(alloca(strlen(demo)+1),demo) );
#endif #endif
}
void *bounds_checking_is_enabled()
{
char ca[10], *cp = ca-1;
return (ca != cp + 1) ? cp : NULL;
} }
void c99_vla_test(int size1, int size2) void c99_vla_test(int size1, int size2)
{ {
#if defined __i386__ || defined __x86_64__ #if defined __i386__ || defined __x86_64__
int tab1[size1 * size2][2], tab2[10][2]; int tab1[size1 * size2][2], tab2[10][2];
void *tab1_ptr, *tab2_ptr, *bad_ptr; void *tab1_ptr, *tab2_ptr, *bad_ptr;
@ -2087,6 +2093,32 @@ void c99_vla_test(int size1, int size2)
printf("Test C99 VLA 3 (ptr add): "); printf("Test C99 VLA 3 (ptr add): ");
printf("%s\n", &tab1[5][1] == (tab1_ptr + (5 * 2 + 1) * sizeof(int)) ? "PASSED" : "FAILED"); printf("%s\n", &tab1[5][1] == (tab1_ptr + (5 * 2 + 1) * sizeof(int)) ? "PASSED" : "FAILED");
printf("Test C99 VLA 4 (ptr access): "); printf("Test C99 VLA 4 (ptr access): ");
tab1[size1][1] = 42;
printf("%s\n", (*((int *) (tab1_ptr + (size1 * 2 + 1) * sizeof(int))) == 42) ? "PASSED" : "FAILED");
printf("Test C99 VLA 5 (bounds checking (might be disabled)): ");
if (bad_ptr = bounds_checking_is_enabled()) {
int *t1 = &tab1[size1 * size2 - 1][3];
int *t2 = &tab2[9][3];
printf("%s ", bad_ptr == t1 ? "PASSED" : "FAILED");
printf("%s ", bad_ptr == t2 ? "PASSED" : "FAILED");
char*c1 = 1 + sizeof(tab1) + (char*)tab1;
char*c2 = 1 + sizeof(tab2) + (char*)tab2;
printf("%s ", bad_ptr == c1 ? "PASSED" : "FAILED");
printf("%s ", bad_ptr == c2 ? "PASSED" : "FAILED");
int *i1 = tab1[-1];
int *i2 = tab2[-1];
printf("%s ", bad_ptr == i1 ? "PASSED" : "FAILED");
printf("%s ", bad_ptr == i2 ? "PASSED" : "FAILED");
int *x1 = tab1[size1 * size2 + 1];
int *x2 = tab2[10 + 1];
printf("%s ", bad_ptr == x1 ? "PASSED" : "FAILED");
printf("%s ", bad_ptr == x2 ? "PASSED" : "FAILED");
} else {
printf("PASSED PASSED PASSED PASSED PASSED PASSED PASSED PASSED ");
} }
printf("\n"); printf("\n");
#endif #endif