From: Bernhard Voelker Date: Wed, 26 Mar 2014 01:45:58 +0000 (+0100) Subject: strftime: wrap macros in "do {...} while(0)" X-Git-Tag: v1.0~7412 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=2d6dfaca3e462714bd5220732387b9770733d42a;p=gnulib.git strftime: wrap macros in "do {...} while(0)" * lib/strftime.c (DO_NUMBER): Wrap multi-statement code block of this macro in "do {...} while(0)" to prevent false use as a single statement, e.g., in an un-braced "{}" else-block. (DO_SIGNED_NUMBER, DO_TZ_OFFSET, DO_NUMBER_SPACEPAD): Likewise. (strftime_case_): Remove 'else' after 'goto' - which was the only non-fatal, un-braced use of one of the above macros. Spotted by coverity (NESTING_INDENT_MISMATCH). --- diff --git a/ChangeLog b/ChangeLog index 30b364b119..93a98ea15d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2014-03-26 Bernhard Voelker + + strftime: wrap macros in "do {...} while(0)" + * lib/strftime.c (DO_NUMBER): Wrap multi-statement code block of + this macro in "do {...} while(0)" to prevent false use as a + single statement, e.g., in an un-braced "{}" else-block. + (DO_SIGNED_NUMBER, DO_TZ_OFFSET, DO_NUMBER_SPACEPAD): Likewise. + (strftime_case_): Remove 'else' after 'goto' - which was the + only non-fatal, un-braced use of one of the above macros. + Spotted by coverity (NESTING_INDENT_MISMATCH). + 2014-03-26 Bernhard Voelker modechange: avoid memory leaks for invalid octal modes diff --git a/lib/strftime.c b/lib/strftime.c index c1ec41422b..857cca568b 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -681,24 +681,44 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, switch (format_char) { #define DO_NUMBER(d, v) \ - digits = d; \ - number_value = v; goto do_number + do \ + { \ + digits = d; \ + number_value = v; \ + goto do_number; \ + } \ + while (0) #define DO_SIGNED_NUMBER(d, negative, v) \ - digits = d; \ - negative_number = negative; \ - u_number_value = v; goto do_signed_number + do \ + { \ + digits = d; \ + negative_number = negative; \ + u_number_value = v; \ + goto do_signed_number; \ + } \ + while (0) /* The mask is not what you might think. When the ordinal i'th bit is set, insert a colon before the i'th digit of the time zone representation. */ #define DO_TZ_OFFSET(d, negative, mask, v) \ - digits = d; \ - negative_number = negative; \ - tz_colon_mask = mask; \ - u_number_value = v; goto do_tz_offset + do \ + { \ + digits = d; \ + negative_number = negative; \ + tz_colon_mask = mask; \ + u_number_value = v; \ + goto do_tz_offset; \ + } \ + while (0) #define DO_NUMBER_SPACEPAD(d, v) \ - digits = d; \ - number_value = v; goto do_number_spacepad + do \ + { \ + digits = d; \ + number_value = v; \ + goto do_number_spacepad; \ + } \ + while (0) case L_('%'): if (modifier != 0) @@ -1265,9 +1285,9 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, } if (modifier == L_('O')) goto bad_format; - else - DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE, - tp->tm_year + (unsigned int) TM_YEAR_BASE); + + DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE, + tp->tm_year + (unsigned int) TM_YEAR_BASE); case L_('y'): if (modifier == L_('E'))