From 834b3760a7ca112573e813bd6c3573a8c0daf4ed Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 1 Oct 2011 01:39:17 +0200
Subject: [PATCH] swresample: check for invalid sample formats.
Bug-Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libswresample/swresample.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 519cadf97c3..7276c7abb5e 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -144,7 +144,15 @@ int swr_init(SwrContext *s){
s-> in_sample_fmt &= 0xFF;
s->out_sample_fmt &= 0xFF;
- //We assume AVOptions checked the various values and the defaults where allowed
+ if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){
+ av_log(s, AV_LOG_ERROR, "Requested sample format %s is invalid\n", av_get_sample_fmt_name(s->in_sample_fmt));
+ return AVERROR(EINVAL);
+ }
+ if(s->out_sample_fmt >= AV_SAMPLE_FMT_NB){
+ av_log(s, AV_LOG_ERROR, "Requested sample format %s is invalid\n", av_get_sample_fmt_name(s->out_sample_fmt));
+ return AVERROR(EINVAL);
+ }
+
if( s->int_sample_fmt != AV_SAMPLE_FMT_S16
&&s->int_sample_fmt != AV_SAMPLE_FMT_FLT){
av_log(s, AV_LOG_ERROR, "Requested sample format %s is not supported internally, only float & S16 is supported\n", av_get_sample_fmt_name(s->int_sample_fmt));
--
GitLab