[FFmpeg-devel] [PATCH] tests/checkasm/checkasm.c: Assert that aligned_w/h do not overflow

[Martin Storsjö]

On Wed, 2 Apr 2025, Michael Niedermayer wrote:

> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
> tests/checkasm/checkasm.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
> index a5b862fe52e..1cfc4feb488 100644
> --- a/tests/checkasm/checkasm.c
> +++ b/tests/checkasm/checkasm.c
> @@ -58,6 +58,7 @@
> #include <stdlib.h>
> #include <string.h>
> #include "checkasm.h"
> +#include "libavutil/avassert.h"
> #include "libavutil/common.h"
> #include "libavutil/cpu.h"
> #include "libavutil/intfloat.h"
> @@ -1189,10 +1190,12 @@ int checkasm_check_##type(const char *file, int line, \
>                           int align_w, int align_h, \
>                           int padding) \
> { \
> -    int aligned_w = (w + align_w - 1) & ~(align_w - 1); \
> -    int aligned_h = (h + align_h - 1) & ~(align_h - 1); \
> +    int64_t aligned_w = (w - 1LL + align_w) & ~(align_w - 1); \
> +    int64_t aligned_h = (h - 1LL + align_h) & ~(align_h - 1); \
>     int err = 0; \
>     int y = 0; \
> +    av_assert0(aligned_w == (int32_t)aligned_w);\
> +    av_assert0(aligned_h == (int32_t)aligned_h);\

Ok with me.

// Martin