tests/checkasm/checkasm.c: Assert that aligned_w/h do not overflow

Michael Niedermayer committed 1 year ago

Commit d5ad8601 parent 4aeaee11 file · +5 −2Browse files

Unified · Split

 #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"
                           int align_w, int align_h, \
                           int padding) \
 { \
-    int aligned_w = (w + align_w - 1) & ~(align_w - 1); \
+    int64_t aligned_w = (w - 1LL + align_w) & ~(align_w - 1); \
-    int aligned_h = (h + align_h - 1) & ~(align_h - 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);\
     stride1 /= sizeof(*buf1); \
     stride2 /= sizeof(*buf2); \
     for (y = 0; y < h; y++) \

Keyboard shortcuts