[FFmpeg-cvslog] nellymoserenc: fix crash due to memsetting the wrong area.

Reimar Döffinger git at videolan.org
Fri Apr 6 19:51:06 CEST 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Fri Apr  6 15:26:35 2012 +0200| [e8b1da007e7920a3f86d63cfe3fa7bc258f17dfa] | committer: Reimar Döffinger

nellymoserenc: fix crash due to memsetting the wrong area.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

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

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

diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 59e0884..d460ffb 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -389,7 +389,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         memcpy(s->buf + NELLY_BUF_LEN, frame->data[0],
                frame->nb_samples * sizeof(*s->buf));
         if (frame->nb_samples < NELLY_SAMPLES) {
-            memset(s->buf + NELLY_BUF_LEN + avctx->frame_size, 0,
+            memset(s->buf + NELLY_BUF_LEN + frame->nb_samples, 0,
                    (NELLY_SAMPLES - frame->nb_samples) * sizeof(*s->buf));
             if (frame->nb_samples >= NELLY_BUF_LEN)
                 s->last_frame = 1;



More information about the ffmpeg-cvslog mailing list