From patchwork Sat May 11 17:59:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 13072 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DDD4544885F for ; Sat, 11 May 2019 21:09:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AED7B68A9B4; Sat, 11 May 2019 21:09:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-3.mx.upcmail.net (vie01a-dmta-pe07-3.mx.upcmail.net [84.116.36.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FD8268A9AE for ; Sat, 11 May 2019 21:09:28 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.91) (envelope-from ) id 1hPWKt-00022p-33 for ffmpeg-devel@ffmpeg.org; Sat, 11 May 2019 20:03:03 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id PWJvhB3Yk5D5NPWJvhC0qP; Sat, 11 May 2019 20:02:03 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=hRArSbtVD6rxz14_XbYA:9 a=YIuI-TaIr8V38w_e:21 a=Wpug7c258z4BioIg:21 a=1fhp2MxaeJtTNGEnv6mo:22 a=pHzHmUro8NiASowvMSCR:22 a=xoEH_sTeL_Rfw54TyV31:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 11 May 2019 19:59:57 +0200 Message-Id: <20190511175957.582-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGQY/26GU1VgmMqvf3Qn7PSdgSfKsktbH4hWKWSMRWAPAzEJJYmsqMIbM0KXKCU6wzQx8YXWBBDk8yhaAEZxmZgJrc4C9N01VpYT+7D7KBaH7PWkEmQ2 ocBUG7dCNWcTW5RrZSA3TDezAaspH61OeAkdQSsKOAVgI96afqal1Oa+ Subject: [FFmpeg-devel] [PATCH] avcodec/h264_ps: Check offset_for_non_ref_pic and offset_for_top_to_bottom_field X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: signed integer overflow: -2147483648 + -1 cannot be represented in type 'int' Fixes: 14444/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5675880333967360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264_ps.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 7c92c68b38..e38cf2a533 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -451,6 +451,15 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, sps->delta_pic_order_always_zero_flag = get_bits1(gb); sps->offset_for_non_ref_pic = get_se_golomb_long(gb); sps->offset_for_top_to_bottom_field = get_se_golomb_long(gb); + + if ( sps->offset_for_non_ref_pic == INT32_MIN + || sps->offset_for_top_to_bottom_field == INT32_MIN + ) { + av_log(avctx, AV_LOG_ERROR, + "offset_for_non_ref_pic or offset_for_top_to_bottom_field underflow\n"); + goto fail; + } + sps->poc_cycle_length = get_ue_golomb(gb); if ((unsigned)sps->poc_cycle_length >=