RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <michaelni@gmx.at>
(cherry picked from commit 57e5812198)

Conflicts:

	libavcodec/hevc_ps.c
This commit is contained in:
Michael Niedermayer 2014-11-27 15:03:35 +01:00
parent e4f32ef806
commit 5628a54062
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/hevc_ps.c
View File

@ -887,10 +887,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
goto err; goto err;
} }
av_log(s->avctx, AV_LOG_WARNING, "Displaying the whole video surface.\n"); av_log(s->avctx, AV_LOG_WARNING, "Displaying the whole video surface.\n");
sps->pic_conf_win.left_offset = memset(&sps->pic_conf_win, 0, sizeof(sps->pic_conf_win));
sps->pic_conf_win.right_offset = memset(&sps->output_window, 0, sizeof(sps->output_window));
sps->pic_conf_win.top_offset =
sps->pic_conf_win.bottom_offset = 0;
sps->output_width = sps->width; sps->output_width = sps->width;
sps->output_height = sps->height; sps->output_height = sps->height;
} }