[FFmpeg-cvslog] gsmdec: log error message when output buffer is too small.

Justin Ruggles git at videolan.org
Thu Nov 3 02:23:10 CET 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Fri Oct 28 00:34:52 2011 -0400| [bac2597a32b774db9b72163d1476673b57ea0187] | committer: Justin Ruggles

gsmdec: log error message when output buffer is too small.

also return AVERROR(EINVAL) instead of -1

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bac2597a32b774db9b72163d1476673b57ea0187
---

 libavcodec/gsmdec.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c
index 57286c7..26340c2 100644
--- a/libavcodec/gsmdec.c
+++ b/libavcodec/gsmdec.c
@@ -61,8 +61,10 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data,
     int frame_bytes = avctx->frame_size *
                       av_get_bytes_per_sample(avctx->sample_fmt);
 
-    if (*data_size < frame_bytes)
-        return -1;
+    if (*data_size < frame_bytes) {
+        av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n");
+        return AVERROR(EINVAL);
+    }
     *data_size = 0;
     if(buf_size < avctx->block_align)
         return AVERROR_INVALIDDATA;



More information about the ffmpeg-cvslog mailing list