ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Mar 31 01:57:00 2015 +0200| [a38758a97efe9c2de48b5429fd2fdebd55ba6a64] | committer: Michael Niedermayer
avcodec/h264_refs: fix null pointer dereference with -DTRACE Found-by: carl Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a38758a97efe9c2de48b5429fd2fdebd55ba6a64 --- libavcodec/h264_refs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 27619d9..3519870 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -175,16 +175,16 @@ int ff_h264_fill_default_ref_list(H264Context *h, H264SliceContext *sl) #ifdef TRACE for (i = 0; i < sl->ref_count[0]; i++) { tprintf(h->avctx, "List0: %s fn:%d 0x%p\n", - (h->default_ref_list[0][i].parent->long_ref ? "LT" : "ST"), + h->default_ref_list[0][i].parent ? (h->default_ref_list[0][i].parent->long_ref ? "LT" : "ST") : "NULL", h->default_ref_list[0][i].pic_id, - h->default_ref_list[0][i].parent->f.data[0]); + h->default_ref_list[0][i].parent ? h->default_ref_list[0][i].parent->f.data[0] : 0); } if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { for (i = 0; i < sl->ref_count[1]; i++) { tprintf(h->avctx, "List1: %s fn:%d 0x%p\n", - (h->default_ref_list[1][i].parent->long_ref ? "LT" : "ST"), + h->default_ref_list[1][i].parent ? (h->default_ref_list[1][i].parent->long_ref ? "LT" : "ST") : "NULL", h->default_ref_list[1][i].pic_id, - h->default_ref_list[1][i].parent->f.data[0]); + h->default_ref_list[1][i].parent ? h->default_ref_list[1][i].parent->f.data[0] : 0); } } #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
