[FFmpeg-devel] [PATCH 2/4] avcodec/movtextdec: add () to CMP() macro to avoid unexpected behavior

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Mon Feb 14 21:52:52 EET 2022


Michael Niedermayer:
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavcodec/movtextdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
> index 825632ca9b..dc30fdc698 100644
> --- a/libavcodec/movtextdec.c
> +++ b/libavcodec/movtextdec.c
> @@ -263,7 +263,7 @@ static int decode_hclr(const uint8_t *tsmb, MovTextContext *m, uint64_t size)
>  
>  static int styles_equivalent(const StyleBox *a, const StyleBox *b)
>  {
> -#define CMP(field) a->field == b->field
> +#define CMP(field) ((a)->field == (b)->field)
>      return CMP(bold)  && CMP(italic)   && CMP(underline) && CMP(color) &&
>             CMP(alpha) && CMP(fontsize) && CMP(font_id);
>  #undef CMP

LGTM.
(Did you find the issues in patches 2-4 by code inspection or by a
static analyzer?)

- Andreas


More information about the ffmpeg-devel mailing list