roqaudio: Always use the frame buffer on flush

Message ID 20141124013434.46C1A5DD0B@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau Nov. 24, 2014, 1:34 a.m.
Module: libav
Branch: master
Commit: 55b59fab880a9fcdd30f97c5170af282087ac4f7

Author:    Michael Niedermayer <michaelni@gmx.at>
Committer: Vittorio Giovara <vittorio.giovara@gmail.com>
Date:      Wed Nov 12 11:13:10 2014 +0100

roqaudio: Always use the frame buffer on flush

Prevent NULL dereference.

CC: libav-stable@libav.org
Bug-Id: CID 703669
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

---

 libavcodec/roqaudioenc.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c
index f97d5d6..402eb78 100644
--- a/libavcodec/roqaudioenc.c
+++ b/libavcodec/roqaudioenc.c
@@ -147,15 +147,16 @@  static int roq_dpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
             context->input_frames++;
             return 0;
         }
-        in = context->frame_buffer;
     }
+    if (context->input_frames < 8)
+        in = context->frame_buffer;
 
     if (stereo) {
         context->lastSample[0] &= 0xFF00;
         context->lastSample[1] &= 0xFF00;
     }
 
-    if (context->input_frames == 7 || !in)
+    if (context->input_frames == 7)
         data_size = avctx->channels * context->buffered_samples;
     else
         data_size = avctx->channels * avctx->frame_size;