From patchwork Sat Oct 31 14:16:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23301 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 65F7F44AFC7 for ; Sat, 31 Oct 2020 16:23:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E3CF68AA85; Sat, 31 Oct 2020 16:23:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47A1468A2B6 for ; Sat, 31 Oct 2020 16:23:50 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id w23so5302154wmi.4 for ; Sat, 31 Oct 2020 07:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=k15yuao1N5frC9YyJDZiPgqvbheISGrsv5U3Una8gkQ=; b=TWDitGBYWFoYCL2zLgkcva8FnNMs/PMQByWXYqqSvdzjTrk7uI5BKcaW7IGH5NIMmv wLcW543nWXI5ktBJVkUiyJxJh6ldHp7qXYU11acZoc+lojSCtvfemxVGXMeecQ1CvSZ+ fMgLty2UyOgxBlJv5C6e/uZh8jYEvxS4wl7Pf/hkMHMauwPwZVqkeRSdsfmMLYq+k3Oa CJi16Gybju+DfrHoee4O5vta49hjcESk8s/Ap1giyFmNDjoHLLFUOydDI5wBPd181f/T CJ/9C78YfV26PPyNSy8h8NtszL2McvHdYuu0iipiTzp/PHUByOhXc5fXSh02SVMs6dXD Kwsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=k15yuao1N5frC9YyJDZiPgqvbheISGrsv5U3Una8gkQ=; b=WdvBgM1YLZr1S2yFcCnoZ9hqVdJMDZsNdsD7MX5ewrGaFLyXQv/Bo+ym0Zkrbtpqbg 6UXW32ymOlPZBPWczfyiVzqtUVpoCrxz45A02NUmsVrifMPajegtIsdcLZl0QWj7Z8hp ElcN7gBeUqHmAvoEb2tfM/zRz+69c7uEydoy0uien7Zw+SsOLXjCECGNBUbhM14qXkDE bww72BQjze10ua7tgnqSzcGKVMplfRJ7YIEN9MCy2hMfUxMXd3ZntkpLCpphSfJH5lSV PS1bgBjnKJ8BYGfHdiu9l0cpDSteFDn7QIPxPUY705IC3jytimChPzNETKY4XZBpPnIA lVGQ== X-Gm-Message-State: AOAM532++xlpnbQWRvQIVbgBZK8UkTJIEbhY2zfsYkqmnFkZpwV5QkLt pDLhCxhNIKzKTLsnGcV2hYG+7BSRqbg= X-Google-Smtp-Source: ABdhPJzZ3VeUDKbAKSshblPHb4epGUET+CECa76s/gkxk5EgQWel2mgj5UuL31r4rj6v1Sy54u+W4Q== X-Received: by 2002:a7b:cbc3:: with SMTP id n3mr8537569wmi.68.1604153817366; Sat, 31 Oct 2020 07:16:57 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id r1sm15522273wro.18.2020.10.31.07.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2020 07:16:56 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 31 Oct 2020 15:16:25 +0100 Message-Id: <20201031141626.727000-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201031141626.727000-1-andreas.rheinhardt@gmail.com> References: <20201031141626.727000-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/4] avformat/apngdec: Check fcTL chunk length when reading header 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Reading the header terminates when an fcTL chunk is encountered in which case read_header returned success without checking the length of said chunk. Yet when read_packet processes this chunk, it checks for the length to be 26 and errors out otherwise. So do so when reading the header, too. Signed-off-by: Andreas Rheinhardt --- libavformat/apngdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index d8d0de190f..6b2ce2e251 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -226,7 +226,7 @@ static int apng_read_header(AVFormatContext *s) ctx->num_frames, ctx->num_play); break; case MKTAG('f', 'c', 'T', 'L'): - if (!acTL_found) { + if (!acTL_found || len != 26) { ret = AVERROR_INVALIDDATA; goto fail; }