From patchwork Thu Oct 6 20:37:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38591 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp379242pzd; Thu, 6 Oct 2022 13:38:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7j2bhHjE0PIjFVXj9VvbWq7cR31IGkHXSIgXr+YpMjxuPUmDbZsC+nSqieP+7FEEifnQPT X-Received: by 2002:a05:6402:5485:b0:459:147a:d902 with SMTP id fg5-20020a056402548500b00459147ad902mr1541266edb.263.1665088704498; Thu, 06 Oct 2022 13:38:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665088704; cv=none; d=google.com; s=arc-20160816; b=bbeoLKDOGCf46XNwkWt1I7g9aLyMC9sAKK+xfq/lqsZO2aq6LYvSSpmaE0LHIXpqnl /D+nnp/m8+MWXcGay82aUhdwEaL/TY/8yCVAD5LrsvTpMTTiYNr3EeXxZI58eMxZfyZ6 d8M6hclAbOoi9xSLsZ+Ant3tuEBSOYr4Fu4WIOFiab2Mxv25joqHaxMHvSVBFTrZbnF/ UvHP38GyoFzbP1Tg4wuW4XBbZP6oczZyGzEwi0EhiWm/I57CxlUsmfz3V22upC/KbA6U hYs7zW2h4hSej4XGu76MWzwh43mjG45eCo2JC9ikJlwTBJqMbZ1HcQa3piHIeM2O9mho ErOw== 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=CE3BnIosQ6BwMwFIy1qCHy2fGDUpNNQv4XB7vTuyXwk=; b=Qqog/DL2TO7i3RZQTbIE9Z/MFHzPhwMCtYjWgOyeh3ZaI/M/VxNxQJ9YLw3Ufh/vc6 X8KBNFqfnSNIkxigZTVXau22Cny2MKVEUx4QzfvMPKjz246zxEMuUg2npD5HUtCUm/OG RYBuJED4R8oZ2H28m1i4X8SAZAzrXOyu0hll+wPFCXJHElsWYvG+YEMR9svTXB53YKfR g3hzqzVlWtLnwXHlJwYCzNvT8I6l7bHobkQ7z/BhpINP5/13fmxgAfoIyqk2UQdhwY1R iQgYD/Ry2+B8x1BEg4/JmNqqww8V+OpX/vOYLxTfTmxFr74EbNzfkdyME/x4Ntkgo4O4 akcQ== 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 hu9-20020a170907a08900b0077fb99b8cfcsi422396ejc.301.2022.10.06.13.38.19; Thu, 06 Oct 2022 13:38:24 -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 DDD3568B28D; Thu, 6 Oct 2022 23:38:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D9DA68B28D for ; Thu, 6 Oct 2022 23:38:11 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ogXdC-00B8NB-3G for ffmpeg-devel@ffmpeg.org; Thu, 06 Oct 2022 22:38:10 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gXdCoWSJN8s8UgXdCogSAl; Thu, 06 Oct 2022 22:38:10 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id gXcEoTQ47OG5ZgXcEoJZ6l; Thu, 06 Oct 2022 22:37:10 +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=KJo5sHJo c=1 sm=1 tr=0 ts=633f3c76 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=OK22HhqQUKf8rs4aKIwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Oct 2022 22:37:07 +0200 Message-Id: <20221006203709.8398-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221006203709.8398-1-michael@niedermayer.cc> References: <20221006203709.8398-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfFT+UgnA98OmMSYCu40YSlo0IJrnb9WMI5unwT/5ZUppbFXK+Bg3RmmD72JpvdkAKbWGzH+ZcG8sKKg87FqO3+rbVnNUnYI/Godnas+nliVvMEMEolES UlCVeuLP9T9Zfp4bRC0KyBhpTqfOIcTEiAj1iC5Nog6yAGo0se/7453y+cI03g9DUuyJPQqnPl/VIw== Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/ffv1dec: Fail earlier if prior context is corrupted 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: JBMzE0TXRXFT Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d4bc60a7da8..958b3cd3c05 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -303,8 +303,11 @@ static int decode_slice(AVCodecContext *c, void *arg) } if ((ret = ff_ffv1_init_slice_state(f, fs)) < 0) return ret; - if (f->cur->key_frame || fs->slice_reset_contexts) + if (f->cur->key_frame || fs->slice_reset_contexts) { ff_ffv1_clear_slice_state(f, fs); + } else if (fs->slice_damaged) { + return AVERROR_INVALIDDATA; + } width = fs->slice_width; height = fs->slice_height;