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

h264: Make sure reinit failures mark the context as not initialized 

Bug-Id: CVE-2015-3417
CC: libav-stable@libav.org
This commit is contained in:
Luca Barbato 2015-05-25 22:30:10 +02:00
parent 7064209096
commit 3b69f245db
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h264_slice.c
View File

@ -1319,6 +1319,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
}
if (h->context_initialized && needs_reinit) {
h->context_initialized = 0;
if (h != h0) {
av_log(h->avctx, AV_LOG_ERROR,
"changing width %d -> %d / height %d -> %d on "