[FFmpeg-cvslog] h264: reset current_slice on context reinit

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 18 15:16:36 2012 +0200| [820109224142323f182c2917e3d8ddc34324b5df] | committer: Michael Niedermayer

h264: reset current_slice on context reinit

This fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2903cf9..117cd7e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2975,6 +2975,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
         flush_dpb(s->avctx);
         ff_MPV_common_end(s);
         h->list_count = 0;
+        h->current_slice = 0;
     }
     if (!s->context_initialized) {
         if (h != h0) {