projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf044f8
)
smacker: validate channels and sample format.
author
Justin Ruggles
<justin.ruggles@gmail.com>
Wed, 21 Sep 2011 15:49:33 +0000
(11:49 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 11 Oct 2011 11:48:16 +0000
(07:48 -0400)
libavcodec/smacker.c
patch
|
blob
|
history
diff --git
a/libavcodec/smacker.c
b/libavcodec/smacker.c
index
20ddc15
..
d8a3d77
100644
(file)
--- a/
libavcodec/smacker.c
+++ b/
libavcodec/smacker.c
@@
-606,6
+606,14
@@
static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
av_log(avctx, AV_LOG_ERROR, "Frame is too large to fit in buffer\n");
return -1;
}
+ if (stereo ^ (avctx->channels != 1)) {
+ av_log(avctx, AV_LOG_ERROR, "channels mismatch\n");
+ return AVERROR(EINVAL);
+ }
+ if (bits && avctx->sample_fmt == AV_SAMPLE_FMT_U8) {
+ av_log(avctx, AV_LOG_ERROR, "sample format mismatch\n");
+ return AVERROR(EINVAL);
+ }
memset(vlc, 0, sizeof(VLC) * 4);
memset(h, 0, sizeof(HuffContext) * 4);