summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2014-01-30 14:08:38 -0500
committerMichael Niedermayer <michaelni@gmx.at>2014-02-23 14:28:10 +0100
commita644272a4a954ce99d03cfb5102fbc991b14bd55 (patch)
tree6f822c03bf26fa958ef228f85bbc4847144564a8 /libavutil
parent325feb8e0d5141025548c20aebcbeb92dc2b3a07 (diff)
downloadffmpeg-a644272a4a954ce99d03cfb5102fbc991b14bd55.tar.gz
samplefmt: avoid integer overflow in av_samples_get_buffer_size()
CC:libav-stable@libav.org (cherry picked from commit 0e830094ad0dc251613a0aa3234d9c5c397e02e6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/samplefmt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index 08ecc83467..a1986980f0 100644
--- a/libavutil/samplefmt.c
+++ b/libavutil/samplefmt.c
@@ -135,6 +135,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);
}