From patchwork Tue Jul 20 20:29:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28986 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5654590ios; Tue, 20 Jul 2021 13:30:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxiVWMrW6pS2dM6S2pPO9XsZhTbjlYXATcj1oYwi7ThFIpqg1fIvw7962P/Pc4YHUHMQlP X-Received: by 2002:a17:906:3042:: with SMTP id d2mr35392472ejd.234.1626813054845; Tue, 20 Jul 2021 13:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626813054; cv=none; d=google.com; s=arc-20160816; b=YbbH6x9ejrvqF+ZKV3ZSDXjP1/biQkTddZQlKNVsaAGIc8UiZLiL1ntR3HmpSw3R4R bI04cCe1vY5lGuuSvUB63fwWibTgSk5sbwBnPCY/DX5ND6t4Y7dAqnm+DqKADgOWOF4W c1PrrHyuIuhlgakZLj9Ej5Wj0eLQzPe/JNpNZSZPF6UGIkMB63yqr394rqxK62ftZJbg LO8pDEbZKixM7kSXRk+Qm22Xc2xO6jYD/hhyMqCMki3Sv0bu+Q0akzCkS1LsX3kS5dhL ABCDN9LUo/Cz0dnn2eUseNYF+coSREZy9SgO4I5TPxQineQWi8AwSA0izAgrF0BV0S1U +i9A== 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=xBsdn/U9Iw4UN5EtO/SC0wlIIeaR9KV6/hFlg/LBMlQ=; b=r0s+obHXSHUd2bqLbr4FvWp7xRosT2kQHhiqYbksepxVBxm1vG2HbxNrDrEN4Q46lA Qwlytg+pm/2z8NJPuqrAAUwJxynT6LajNEwgYkci3ttiLdUVIcx/6tyVa3Mu5vNA295n OY01PaHpcWy8J/bZd58Y+RCDwuEHnYhOVvadeIN9cDdZhLUf0L9feiHsDTdYzobL2ump A3bQDv4IJIn2vwM7WVO/+eBOOpnt/ecy2FCp6XpmJXwN4cK7/W7mW79/yTI4uQizg0wg D1ivglNe3RA5dLzeUFkJy3k4bp5FVg4BsXtHFq5d97/R+c5a50wOpSH8z6+BhJqKZNtn Fagg== 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 v16si3252047edc.281.2021.07.20.13.30.53; Tue, 20 Jul 2021 13:30:54 -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 D8EAA68A985; Tue, 20 Jul 2021 23:30:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5E5E68A7E9 for ; Tue, 20 Jul 2021 23:30:43 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m5wO3-00CX8u-0D for ffmpeg-devel@ffmpeg.org; Tue, 20 Jul 2021 22:30:43 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 5wN5mFNf7ljeH5wN5mRWkv; Tue, 20 Jul 2021 22:29:43 +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=WOwssihy0adnk52P:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=yEkePO1MDcaG1OJzFoMA:9 a=h9g_fFhjIUyzDAgiCCcC:22 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Jul 2021 22:29:42 +0200 Message-Id: <20210720202942.8574-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210720202942.8574-1-michael@niedermayer.cc> References: <20210720202942.8574-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEwUiH3ZSFrn+ZnK/S5uVhxNoP+CJ4LremiwY4nHe7REYpgFl3KH5goaaSNtJLrRJLQvWxz4sQgjmGfwMcyNZmxo/wPFjdZKcgvRw+ruQ0tF7A6vSMfR C45qFAGN1ioxLOh2E840WjggqwSed73GM2RZm0+sa7Qly1TGwYhmoSjd Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/targa: Do not return images when there is no image in the tga 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: 3EQ73Ci1Eate Fixes: Timeout Fixes: 35877/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TARGA_fuzzer-5407292819374080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/targa.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 3502636c16..221fcc956d 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -176,6 +176,10 @@ static int decode_frame(AVCodecContext *avctx, if ((ret = ff_set_dimensions(avctx, w, h)) < 0) return ret; + if ((compr & (~TGA_RLE)) == TGA_NODATA) { + return avpkt->size; + } + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) return ret; p->pict_type = AV_PICTURE_TYPE_I; @@ -242,9 +246,6 @@ static int decode_frame(AVCodecContext *avctx, } } - if ((compr & (~TGA_RLE)) == TGA_NODATA) { - memset(p->data[0], 0, p->linesize[0] * h); - } else { if (compr & TGA_RLE) { int res = targa_decode_rle(avctx, s, dst, w, h, stride, bpp, interleave); if (res < 0) @@ -289,7 +290,6 @@ static int decode_frame(AVCodecContext *avctx, } } } - } *got_frame = 1;