Module: libav Branch: release/9 Commit: 3e3805b7fae6bda01e40462079028f8e6bfedea9
Author: Justin Ruggles <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Thu Jan 30 14:08:38 2014 -0500 samplefmt: avoid integer overflow in av_samples_get_buffer_size() CC:[email protected] (cherry picked from commit 0e830094ad0dc251613a0aa3234d9c5c397e02e6) --- libavutil/samplefmt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index 389f726..bff6004 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -118,6 +118,8 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, /* auto-select alignment if not specified */ if (!align) { + if (nb_samples > INT_MAX - 31) + return AVERROR(EINVAL); align = 1; nb_samples = FFALIGN(nb_samples, 32); } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
