From 550e861bf7a2196cec7d7844526c3f11e810c5be Mon Sep 17 00:00:00 2001 From: "Pavlas, Zdenek" Date: Wed, 9 Nov 2016 04:03:17 -0800 Subject: [PATCH] bcheck: add structs to local regions int test() { struct { int i; } s = { 42 }; return s.i; // bound checked } --- tccgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tccgen.c b/tccgen.c index fdd86543..a8e1e976 100644 --- a/tccgen.c +++ b/tccgen.c @@ -6234,7 +6234,7 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r, if ((r & VT_VALMASK) == VT_LOCAL) { sec = NULL; #ifdef CONFIG_TCC_BCHECK - if (tcc_state->do_bounds_check && (type->t & VT_ARRAY)) { + if (tcc_state->do_bounds_check && ((type->t & VT_ARRAY) || (type->t & VT_BTYPE) == VT_STRUCT)) { loc--; } #endif @@ -6244,7 +6244,7 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r, /* handles bounds */ /* XXX: currently, since we do only one pass, we cannot track '&' operators, so we add only arrays */ - if (tcc_state->do_bounds_check && (type->t & VT_ARRAY)) { + if (tcc_state->do_bounds_check && ((type->t & VT_ARRAY) || (type->t & VT_BTYPE) == VT_STRUCT)) { addr_t *bounds_ptr; /* add padding between regions */ loc--;