[FFmpeg-cvslog] g726: Do not crash on user mistake
Luca Barbato
git at videolan.org
Sun Jul 12 15:15:30 CEST 2015
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Jul 11 11:47:13 2015 +0200| [355864ef7a9548ee6491a25de1e0650bd983a667] | committer: Luca Barbato
g726: Do not crash on user mistake
Properly report the sample rate as invalid
CC: libav-stable at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=355864ef7a9548ee6491a25de1e0650bd983a667
---
libavcodec/g726.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 9ad91f2..b877687 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -23,7 +23,6 @@
*/
#include <limits.h>
-#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "avcodec.h"
@@ -315,7 +314,11 @@ static av_cold int g726_encode_init(AVCodecContext *avctx)
"Resample or reduce the compliance level.\n");
return AVERROR(EINVAL);
}
- av_assert0(avctx->sample_rate > 0);
+ if (avctx->sample_rate <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid sample rate %d\n",
+ avctx->sample_rate);
+ return AVERROR(EINVAL);
+ }
if(avctx->channels != 1){
av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n");
More information about the ffmpeg-cvslog
mailing list