From patchwork Wed Sep 29 19:16:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30658 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp682609iob; Wed, 29 Sep 2021 12:18:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDM0Ppuuv4fYsNUmsQYqVyfJ4YhxGMycjkBawTYIEjFjLQlCZcgoa+r5g8Oi7vHfhwAFZt X-Received: by 2002:a17:906:3383:: with SMTP id v3mr1804613eja.213.1632943082342; Wed, 29 Sep 2021 12:18:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632943082; cv=none; d=google.com; s=arc-20160816; b=IuOtxyYKhj9FxR3D4uIVrtU6OGpuN5Qs3S2nwOBput6gCZ8XFQZ8Ep1ad7fIVThknr AjdHhne3WyFsX6PzH/4dNuUL4AUlLULnmFeUlMOEip9GEMq2fj04F/TrMK3TedTtze4A LDcIapgvPwhGvNnKOH9FybPjDNRjOyIUhhFdWNajuEvxTv1iYBIdsA1nSddKLIY+PHXC qSExBx1mS5F85c1hjd5lxmkXRS324iwcRJbnT+0SuAK78u9XJOEqSB7BDhV9dvq6KVXX XKTNYg7bsFSLSEzeSYwb+xDBYgtT3M88yNJQuiHKLXHIzN/B2y1F5S8v38v1m5U9P4Ie Yf5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=iBMSVIt7Rga1o5CBISzlsrAPQq47lg6VhL7ucdIWNUk=; b=VYA4VcuTXPksPPSA0WCTVT4rv9Qq7ZIJsi6FZf6O4FbXH8eX0V789Tf0hlWP8wMcai EjxxZ0F3Vlf1DXEMCD+Dt2XBWQbDlGAVSIjaRZmgIXyXevdqD+bvw6kl3gR6Uta34+w1 T8W5YDHdSudpVdE0hHycdBjk919zyBGuqDiDs//fGMUv8E0vpXb3xFDyErRosMe89deD +aLzoO/cIKS7jV1dvJskPrsWfq/sIyYgtZxOnwgijpwHwwskwvlRgD+joWaEeMah89u4 e9wHRTHw8Sy2sr2q3c7tK8EdNwhk+i9XyFj+QphVpXopkjxBsf0YjULW4SKgCurheGYn i3pw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nc14si1513791ejc.445.2021.09.29.12.18.01; Wed, 29 Sep 2021 12:18:02 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADA5A68A0BF; Wed, 29 Sep 2021 22:17:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9153680843 for ; Wed, 29 Sep 2021 22:17:30 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mVf58-00AitM-0B for ffmpeg-devel@ffmpeg.org; Wed, 29 Sep 2021 21:17:30 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Vf4AmyVt0ljeHVf4Am4ELb; Wed, 29 Sep 2021 21:16:30 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=hdD6pDYhwXcYO6yWVyQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 29 Sep 2021 21:16:29 +0200 Message-Id: <20210929191629.9314-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210929191629.9314-1-michael@niedermayer.cc> References: <20210929191629.9314-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKxsJQVBsB243tVlcawxSIQrGz+jRk/cba1q2Pe65n4K8ZMPDOfwI+SMFwoSRKZ/oPlYk8z8uOXJVHNnMX3mNUeHazKfkgrpZ5fZ98LYcKIkZNYn7R4m DtoOBY0Yq/hD49CuuL+a7ro4q82z2rhStp0amwrXXtBLZcA1FfpGgc4H Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/h264_slice: Check idr_pic_id X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NwHA23Ml8UuB Fixes: left shift of negative value -1 Fixes: 39223/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5498831521841152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264_slice.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 201b22455cf..89ea16a57ff 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1911,8 +1911,13 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, sl->max_pic_num = 1 << (sps->log2_max_frame_num + 1); } - if (nal->type == H264_NAL_IDR_SLICE) - sl->idr_pic_id = get_ue_golomb_long(&sl->gb); + if (nal->type == H264_NAL_IDR_SLICE) { + unsigned idr_pic_id = get_ue_golomb_long(&sl->gb); + if (idr_pic_id < 65536) { + sl->idr_pic_id = idr_pic_id; + } else + av_log(h->avctx, AV_LOG_WARNING, "idr_pic_id is invalid\n"); + } sl->poc_lsb = 0; sl->delta_poc_bottom = 0;