From: Benjamin Kaduk Date: Tue, 4 May 2021 19:33:28 +0000 (-0700) Subject: tasn_dec: use do/while around statement macros X-Git-Tag: openssl-3.0.0-alpha17~209 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32b1da718d5d6f35fcef82f3794273807d6202e9;p=thirdparty%2Fopenssl.git tasn_dec: use do/while around statement macros Use the do {} while (0) construct around macros whose bodies are complete statements (including one that has internal control flow!). This is safer and avoids any risk of misinterpretation if the macro is used in an unexpected context. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/15143) --- diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c index 20717df461d..aaf3de7e192 100644 --- a/crypto/asn1/tasn_dec.c +++ b/crypto/asn1/tasn_dec.c @@ -90,9 +90,9 @@ unsigned long ASN1_tag2bit(int tag) /* Macro to initialize and invalidate the cache */ -#define asn1_tlc_clear(c) if ((c) != NULL) (c)->valid = 0 +#define asn1_tlc_clear(c) do { if ((c) != NULL) (c)->valid = 0; } while (0) /* Version to avoid compiler warning about 'c' always non-NULL */ -#define asn1_tlc_clear_nc(c) (c)->valid = 0 +#define asn1_tlc_clear_nc(c) do {(c)->valid = 0; } while (0) /* * Decode an ASN1 item, this currently behaves just like a standard 'd2i'