On 2014-01-06 08:36:36 +0100, Anton Khirnov wrote:
> Fixes invalid reads.
>
> Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
> CC:libav-sta...@libav.org
> ---
> libavcodec/h264.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/h264.c b/libavcodec/h264.c
> index 9817d20..ed5aea8 100644
> --- a/libavcodec/h264.c
> +++ b/libavcodec/h264.c
> @@ -3348,7 +3348,7 @@ static int decode_slice_header(H264Context *h,
> H264Context *h0)
> first_mb_in_slice = get_ue_golomb(&h->gb);
>
> if (first_mb_in_slice == 0) { // FIXME better field boundary detection
> - if (h0->current_slice && FIELD_PICTURE(h)) {
> + if (h0->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) {
> field_end(h, 1);
> }
ok
Janne
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
