diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 769be8352c59cc5670629444dfbdc216dd620d83..14ead2bb0c6dc9f61a0663166431efd4bfe7301e 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -384,6 +384,13 @@ static av_cold int vsink_init(AVFilterContext *ctx, void *opaque)
     return common_init(ctx);
 }
 
+#define CHECK_LIST_SIZE(field) \
+        if (buf->field ## _size % sizeof(*buf->field)) { \
+            av_log(ctx, AV_LOG_ERROR, "Invalid size for " #field ": %d, " \
+                   "should be multiple of %d\n", \
+                   buf->field ## _size, (int)sizeof(*buf->field)); \
+            return AVERROR(EINVAL); \
+        }
 static int vsink_query_formats(AVFilterContext *ctx)
 {
     BufferSinkContext *buf = ctx->priv;
@@ -391,11 +398,7 @@ static int vsink_query_formats(AVFilterContext *ctx)
     unsigned i;
     int ret;
 
-    if (buf->pixel_fmts_size % sizeof(*buf->pixel_fmts)) {
-        av_log(ctx, AV_LOG_ERROR, "Invalid size for format list\n");
-        return AVERROR(EINVAL);
-    }
-
+    CHECK_LIST_SIZE(pixel_fmts)
     if (buf->pixel_fmts_size) {
         for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++)
             if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0)
@@ -433,23 +436,10 @@ static int asink_query_formats(AVFilterContext *ctx)
     unsigned i;
     int ret;
 
-    if (buf->sample_fmts_size     % sizeof(*buf->sample_fmts)     ||
-        buf->sample_rates_size    % sizeof(*buf->sample_rates)    ||
-        buf->channel_layouts_size % sizeof(*buf->channel_layouts) ||
-        buf->channel_counts_size  % sizeof(*buf->channel_counts)) {
-        av_log(ctx, AV_LOG_ERROR, "Invalid size for format lists\n");
-#define LOG_ERROR(field) \
-        if (buf->field ## _size % sizeof(*buf->field)) \
-            av_log(ctx, AV_LOG_ERROR, "  " #field " is %d, should be " \
-                   "multiple of %d\n", \
-                   buf->field ## _size, (int)sizeof(*buf->field));
-        LOG_ERROR(sample_fmts);
-        LOG_ERROR(sample_rates);
-        LOG_ERROR(channel_layouts);
-        LOG_ERROR(channel_counts);
-#undef LOG_ERROR
-        return AVERROR(EINVAL);
-    }
+    CHECK_LIST_SIZE(sample_fmts)
+    CHECK_LIST_SIZE(sample_rates)
+    CHECK_LIST_SIZE(channel_layouts)
+    CHECK_LIST_SIZE(channel_counts)
 
     if (buf->sample_fmts_size) {
         for (i = 0; i < NB_ITEMS(buf->sample_fmts); i++)
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index d71eb1ef4c8a03bbd3cfe02c477c0bef83f9f620..6f307d6c5dbe83945fbba7d861b8711c75abdcc6 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -261,7 +261,7 @@ static inline void *av_x_if_null(const void *p, const void *x)
  * @return  length of the list, in elements, not counting the terminator
  */
 unsigned av_int_list_length_for_size(unsigned elsize,
-                                     const void *list, uint64_t term);
+                                     const void *list, uint64_t term) av_pure;
 
 /**
  * Compute the length of an integer list.
@@ -271,7 +271,7 @@ unsigned av_int_list_length_for_size(unsigned elsize,
  * @return  length of the list, in elements, not counting the terminator
  */
 #define av_int_list_length(list, term) \
-    av_int_list_length_for_size(sizeof(*list), list, term)
+    av_int_list_length_for_size(sizeof(*(list)), list, term)
 
 /**
  * @}
diff --git a/libavutil/opt.h b/libavutil/opt.h
index e36825945537b781c35bf6cd5cf5d7ae9d6da4d8..7f7b54e708679403bd226783d9ddd408279ca364 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -668,8 +668,10 @@ int av_opt_set_video_rate(void *obj, const char *name, AVRational val, int searc
  * @param flags  search flags
  */
 #define av_opt_set_int_list(obj, name, val, term, flags) \
-    av_opt_set_bin(obj, name, (const uint8_t *)val, \
-                   av_int_list_length(val, term) * sizeof(*val), flags)
+    (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \
+     AVERROR(EINVAL) : \
+     av_opt_set_bin(obj, name, (const uint8_t *)(val), \
+                    av_int_list_length(val, term) * sizeof(*(val)), flags))
 /**
  * @}
  */