[FFmpeg-cvslog] h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
Anton Khirnov
git at videolan.org
Sat Jan 4 02:12:37 CET 2014
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Nov 28 10:54:35 2013 +0100| [58312b2472d3a44d7458865c459d59ef2e02bf1a] | committer: Anton Khirnov
h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
If it was set before then we can end up trying to decode a slice without
a valid slice header, which can lead to invalid memory access.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58312b2472d3a44d7458865c459d59ef2e02bf1a
---
libavcodec/h264.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f610d71..3aa3af0 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4725,8 +4725,13 @@ again:
hx->intra_gb_ptr =
hx->inter_gb_ptr = NULL;
- if ((err = decode_slice_header(hx, h)) < 0)
+ if ((err = decode_slice_header(hx, h)) < 0) {
+ /* make sure data_partitioning is cleared if it was set
+ * before, so we don't try decoding a slice without a valid
+ * slice header later */
+ h->data_partitioning = 0;
break;
+ }
hx->data_partitioning = 1;
break;
More information about the ffmpeg-cvslog
mailing list