diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 15:03:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 15:47:49 +0100 |
| commit | 57e5812198aada016e9ba4149123c541f8c8a7ec (patch) | |
| tree | 022067fae3cb2e208fd31b2a53aed4e173c54435 /libavcodec/hevc_ps.c | |
| parent | 29208e6dcf944bbea696d37a354a8bac9b552709 (diff) | |
| download | ffmpeg-57e5812198aada016e9ba4149123c541f8c8a7ec.tar.gz | |
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>
Diffstat (limited to 'libavcodec/hevc_ps.c')
| -rw-r--r-- | libavcodec/hevc_ps.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 0d6ede2384..1f64971d1c 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; } |