From patchwork Thu Apr 28 18:25:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35479 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp113546pzh; Thu, 28 Apr 2022 11:26:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOQX9pvjLviAy2i4pkYEcpECDVOfzfvq1o/dFkYsaK87n0+oIGtDcwgBqxozhNR5c0Q0EO X-Received: by 2002:a05:6402:50c8:b0:426:1462:7aff with SMTP id h8-20020a05640250c800b0042614627affmr10864076edb.37.1651170386696; Thu, 28 Apr 2022 11:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651170386; cv=none; d=google.com; s=arc-20160816; b=JUza4fQa2QuKkANYteZmt8/XrBgI6DW/Gu/wPDyaAXeYxGrs7hQcj5ZPFwsJ0eEbrx W3iFjFFoxfnC/a2VHLZOZ90XEy2EcE5n3i3ky/AMeqzBljZEvt9gvYVbMujLvXJCK04z xg0sYO2SrKNaDEoaMXOFEEfdhRvDvcXqEyeuYo4c2kqeZSP+Q6TIk/27QS3tv2ciiq3E AFFzShHgrMmjiFd/gLk19cq8P0jk5Gz2IRjd0I7AOLf4mglNEBoJqQTPykSMG4emgAbb Fl+Qv1t3J8mafYwdBBUtv+FBOnt/2EQucC7eqC3m7IgTvMBpbBiWdvBUCu9DWjq6UOCA ZJUg== 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:message-id:date:to:from:delivered-to; bh=XGGE8I62eYjYAsv8FObQi1bfl4TBt82pnaWqodbihOk=; b=KW8frwUqpaaeXEKuNNHZa1Ij1Go6gU1nX94vyZ3PPV2Hh2D4lt6rzeEd8ywgf2aTIw xfDjB/a2WK1KmgHZWtX5NWB7MCdBHCAp0R06hZl8vHlsGacRDz5osWpvI9G/UnzUze87 LUq2FHvBQSso4klU1b+aiaHLvrPNppJToHqq+qBIgqxuVyBScOkvmf5J2KKEijgaFxR1 POqwvRhzmaitfJXbMlL6FTZF31lu8IF39mPEvja9YvBNcibp0Aj39N/Jxo58eQDV9LCV 9rWgLpi6eJytXQvJmXBBMKKG/rlc0MTeyv0/KkSfXvY2K1NGvhJwEtSdzilSquU+ulQJ Or/w== 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 b15-20020a056402084f00b0041d79553346si6097579edz.13.2022.04.28.11.26.25; Thu, 28 Apr 2022 11:26:26 -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 26F1368B415; Thu, 28 Apr 2022 21:26:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D401D68B34F for ; Thu, 28 Apr 2022 21:26:15 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nk8q8-0000Up-En for ffmpeg-devel@ffmpeg.org; Thu, 28 Apr 2022 20:26:08 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id k8q8nE0h2SgGFk8q8n2lGz; Thu, 28 Apr 2022 20:26:08 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id k8psnGa3TOPqFk8psnww8P; Thu, 28 Apr 2022 20:25:52 +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.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=626adc40 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=1XWaLZrsAAAA:8 a=pc92SVfSSg3B7L7AOWIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 28 Apr 2022 20:25:52 +0200 Message-Id: <20220428182552.13104-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfBYns36DitpmrQ1MppQN0fXAnb2Yftng1nrh41gbndlV6w1ZxUNRQ2RK3gK3+IVyx24AK+QJHnhCet9enFl0Jw80FYXOF8wZDm6oWa5Pmy0jMIQKVdh+ 8E/4CaT9KwcGOvR4OAggXcyIJAjCpBmyo1cUVyEyqfPjptnrWwu9vo/fM8FXzWEkmA4fKRjNiyzl+Q== Subject: [FFmpeg-devel] [PATCH] avcodec/h264dec: Skip late SEI 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: ySjQXXQKz12v Fixes: Race condition Fixes: clusterfuzz-testcase-minimized-mediasource_MP2T_AVC_pipeline_integration_fuzzer-6282675434094592 Found-by: google ClusterFuzz Tested-by: Dan Sanders Signed-off-by: Michael Niedermayer --- libavcodec/h264dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index d80bc6b17f..2a5b53ea56 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -672,6 +672,10 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) avpriv_request_sample(avctx, "data partitioning"); break; case H264_NAL_SEI: + if (h->setup_finished) { + avpriv_request_sample(avctx, "Late SEI"); + break; + } ret = ff_h264_sei_decode(&h->sei, &nal->gb, &h->ps, avctx); h->has_recovery_point = h->has_recovery_point || h->sei.recovery_point.recovery_frame_cnt != -1; if (avctx->debug & FF_DEBUG_GREEN_MD)