[FFmpeg-cvslog] avcodec/hevc_ps: More complete window reset
ffmpeg | branch: release/2.2 | Michael Niedermayer | Thu Nov 27 15:03:35 2014 +0100| [58e055cb262e7259a6a0c5a231ed7bfeacc8ad58] | committer: Michael Niedermayer avcodec/hevc_ps: More complete window reset Fixes out of array read Fixes: signal_sigsegv_35bcf26_471_cov_2806540268_CAINIT_A_SHARP_4.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 57e5812198aada016e9ba4149123c541f8c8a7ec) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58e055cb262e7259a6a0c5a231ed7bfeacc8ad58 --- libavcodec/hevc_ps.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index be1adb1..aa9153f 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -907,10 +907,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) } av_log(s->avctx, AV_LOG_WARNING, "Displaying the whole video surface.\n"); -sps->pic_conf_win.left_offset = -sps->pic_conf_win.right_offset = -sps->pic_conf_win.top_offset= -sps->pic_conf_win.bottom_offset = 0; +memset(&sps->pic_conf_win, 0, sizeof(sps->pic_conf_win)); +memset(&sps->output_window, 0, sizeof(sps->output_window)); sps->output_width = sps->width; sps->output_height = sps->height; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc_ps: More complete window reset
ffmpeg | branch: release/2.4 | Michael Niedermayer | Thu Nov 27 15:03:35 2014 +0100| [7bce99216f744f76bf9e8cb449cd11a5e301ef68] | committer: Michael Niedermayer avcodec/hevc_ps: More complete window reset Fixes out of array read Fixes: signal_sigsegv_35bcf26_471_cov_2806540268_CAINIT_A_SHARP_4.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 57e5812198aada016e9ba4149123c541f8c8a7ec) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bce99216f744f76bf9e8cb449cd11a5e301ef68 --- libavcodec/hevc_ps.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 0cd2269..11e6eb6 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1030,10 +1030,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) } av_log(s->avctx, AV_LOG_WARNING, "Displaying the whole video surface.\n"); -sps->pic_conf_win.left_offset = -sps->pic_conf_win.right_offset = -sps->pic_conf_win.top_offset= -sps->pic_conf_win.bottom_offset = 0; +memset(&sps->pic_conf_win, 0, sizeof(sps->pic_conf_win)); +memset(&sps->output_window, 0, sizeof(sps->output_window)); sps->output_width = sps->width; sps->output_height = sps->height; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc_ps: More complete window reset
ffmpeg | branch: master | Michael Niedermayer | Thu Nov 27 15:03:35 2014 +0100| [57e5812198aada016e9ba4149123c541f8c8a7ec] | committer: Michael Niedermayer avcodec/hevc_ps: More complete window reset Fixes out of array read Fixes: signal_sigsegv_35bcf26_471_cov_2806540268_CAINIT_A_SHARP_4.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57e5812198aada016e9ba4149123c541f8c8a7ec --- libavcodec/hevc_ps.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 0d6ede2..1f64971 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1025,10 +1025,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) } av_log(s->avctx, AV_LOG_WARNING, "Displaying the whole video surface.\n"); -sps->pic_conf_win.left_offset = -sps->pic_conf_win.right_offset = -sps->pic_conf_win.top_offset= -sps->pic_conf_win.bottom_offset = 0; +memset(&sps->pic_conf_win, 0, sizeof(sps->pic_conf_win)); +memset(&sps->output_window, 0, sizeof(sps->output_window)); sps->output_width = sps->width; sps->output_height = sps->height; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog