From 054fe6e3c6a6e8de24ce498d49e05918248e3b39 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 17 Feb 2025 13:41:12 +0900 Subject: [PATCH] [qfcc] Correct the logic surrounding type attributes I'd messed up the attribute check when encoding the type (such a frequent occurrence, that) and forgotten to check for null pointer on the list from the hash table. Fixes block member arrays not getting their stride decoration. --- tools/qfcc/source/type.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c index 84905e7b2..5e49c6f12 100644 --- a/tools/qfcc/source/type.c +++ b/tools/qfcc/source/type.c @@ -708,11 +708,11 @@ find_type (const type_t *type) } } - const type_t *check; + const type_t *check = nullptr; if (strchr (type->encoding, '%')) { // type chain has attributes so the encoding may be aliased auto list = (const type_t **) Hash_FindList (type_tab, type->encoding); - for (auto c = list; (check = *c); c++) { + for (auto c = list; c && (check = *c); c++) { if (types_same (check, type)) { break; } @@ -1317,7 +1317,7 @@ encode_type (dstring_t *encoding, const type_t *type) { if (!type) return; - if (type->attributes && is_func (type) && type->func.attribute_bits) { + if (type->attributes || (is_func (type) && type->func.attribute_bits)) { dstring_appendstr (encoding, "%"); } switch (type->meta) {