Module: libav
Branch: master
Commit: 439c3d5bcc4a4560eaf5fd43c6e156e3d9bc42f2

Author:    Reimar Döffinger <[email protected]>
Committer: Martin Storsjö <[email protected]>
Date:      Fri Apr  6 15:26:35 2012 +0200

nellymoserenc: fix crash due to memsetting the wrong area.

Signed-off-by: Reimar Döffinger <[email protected]>
Signed-off-by: Martin Storsjö <[email protected]>

---

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

diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 39449ca..2a12853 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;

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to