OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
190d4a4
)
samplefmt: avoid integer overflow in av_samples_get_buffer_size()
author
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 30 Jan 2014 19:08:38 +0000
(14:08 -0500)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 4 Feb 2014 17:32:47 +0000
(12:32 -0500)
CC:libav-stable@libav.org
libavutil/samplefmt.c
patch
|
blob
|
history
diff --git
a/libavutil/samplefmt.c
b/libavutil/samplefmt.c
index
389f726
..
bff6004
100644
(file)
--- 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);
}