lavu/opt: check int lists length for overflow.

Also add parens on macro arguments.

lavu/opt: check int lists length for overflow.
Also add parens on macro arguments.
9e8e03de · Nicolas George · 2a1d7ea5 · 9e8e03de
Commit 9e8e03de authored Apr 13, 2013 by Nicolas George
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

opt.h libavutil/opt.h +4 -2

No files found.
--- 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) > INT_MAX / sizeof(*(val)) ? \
-                   av_int_list_length(val, term) * sizeof(*val), flags)
+     AVERROR(EINVAL) : \
+     av_opt_set_bin(obj, name, (const uint8_t *)(val), \
+                    av_int_list_length(val, term) * sizeof(*(val)), flags))
 /**
 * @}
 */