diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2015-05-25 22:30:10 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-05-30 16:28:32 +0200 |
| commit | 0181ae9af2de1526464d23209b82e6674d362f5d (patch) | |
| tree | 16831f00feca2c11698e6276ed315569764df396 | |
| parent | 5ecabd3c54b7c802522dc338838c9a4c2dc42948 (diff) | |
| download | ffmpeg-0181ae9af2de1526464d23209b82e6674d362f5d.tar.gz | |
h264: Make sure reinit failures mark the context as not initialized
Bug-Id: CVE-2015-3417
CC: libav-stable@libav.org
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1cee6346de..a63f45ad20 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1171,6 +1171,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } if (h->context_initialized && needs_reinit) { + h->context_initialized = 0; if (sl != h->slice_ctx) { av_log(h->avctx, AV_LOG_ERROR, "changing width %d -> %d / height %d -> %d on " |