From patchwork Fri Mar 19 05:59:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26473 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 C3B1C449D11 for ; Fri, 19 Mar 2021 07:59:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 986F168A8F8; Fri, 19 Mar 2021 07:59:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0135468A755 for ; Fri, 19 Mar 2021 07:59:47 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id h13so9409268eds.5 for ; Thu, 18 Mar 2021 22:59:47 -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=yCooxezW47pca0PySozvhLp24UZefqUwoLPDQ1I0t2o=; b=r3JPasv+tN5qXay2DJn70rDOe2UcJ0YvBL0AySTzCUEO+8AFeq7AVeAErUDfjrbN3o 0OCM3vXmHjklY46K5QjhNfwM2nTq4CgtLj18oykq5Zr8jUaoYvhwdHMfVlYrwICbvRqt dW7SIU/J3y2j8EsJrGCEl1wD8kRKZmDxZbVvtZlwog1YDDJf382/Ha2z7gYEpyDPb8Pf DbT9DC+j2U1vEh4HXAQzBdle/PYr0JJ5O627WilIfy3ivjo+K3epNNQn7iWBLhd3r6Ed gwxZPkyWcLrkj7QqXB9wk3C7EvuwKz1XoOFMAwjqyInQKaGDldLaC+9jSceo4fY/RV6b DSJg== 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=yCooxezW47pca0PySozvhLp24UZefqUwoLPDQ1I0t2o=; b=dqPoMRTX4FrSZTjQLFTfnuC5hosUTBXX95m++f5wIrgfcBk9jM8gufFZa0rfn40no3 60i9tFyc68V0wlreLMufrNKdOa7RhZ8wwjoLMEaA09j4OA33OjchMk549qTeplx6wvI5 0DpE5dE+TmWB3aVSZPczaKKZ7vgsGDvF31mVYwdJLenNMoE77VM0XjwFRxfCrNYKpAT6 iV1fQYyyb7Bph9q7uDN/Idn0fhrM1OTaWp2FDtV2+iHvuxHwGJmAipaKt5Z9gTkRT8nC ETF7aWXV32QIQXOAUzOIsXpIgK9hNUKIyzmvQRaWQZENCR08WirFK36fQIyFXGH1gZ6J CM9w== X-Gm-Message-State: AOAM531l6HlP9fwpXSAxxO4Vn56G/WrU14eFO5R+cp/NNw9FK1OnkU02 h/MSAtSp2bw7B8LIrjFxGozJ1pN9QBuCRQ== X-Google-Smtp-Source: ABdhPJzvjRHIxiSI+ogas0EQPa8R+AzcpjxK+tNmoHkRtslbw9hhU9rHlIMLTEsbEg7q0u9pgTH4AQ== X-Received: by 2002:a05:6402:42d1:: with SMTP id i17mr7424761edc.131.1616133587347; Thu, 18 Mar 2021 22:59:47 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id x17sm3109344ejd.68.2021.03.18.22.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:59:46 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 06:59:01 +0100 Message-Id: <20210319055904.2264501-15-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319055904.2264501-1-andreas.rheinhardt@gmail.com> References: <20210319055904.2264501-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/18] avformat/webpenc: Fix memleak when using invalid packets 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" The WebP muxer uses sometimes caches a packet it receives to write it later; yet if a cached packet is too small (so small as to be invalid), it is cached, but not written and not unreferenced. Such a packet leaks, either by being overwritten by the next frame or because it is never unreferenced at all. Fix this by not caching unusable packets at all; and error out on invalid packets. Signed-off-by: Andreas Rheinhardt --- libavformat/webpenc.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavformat/webpenc.c b/libavformat/webpenc.c index 8c32ff66df..e3b12aeed2 100644 --- a/libavformat/webpenc.c +++ b/libavformat/webpenc.c @@ -53,24 +53,22 @@ static int webp_init(AVFormatContext *s) static int is_animated_webp_packet(AVPacket *pkt) { - if (pkt->size) { int skip = 0; unsigned flags = 0; if (pkt->size < 4) - return 0; + return AVERROR_INVALIDDATA; if (AV_RL32(pkt->data) == AV_RL32("RIFF")) skip = 12; - + // Safe to do this as a valid WebP bitstream is >=30 bytes. if (pkt->size < skip + 4) - return 0; + return AVERROR_INVALIDDATA; if (AV_RL32(pkt->data + skip) == AV_RL32("VP8X")) { flags |= pkt->data[skip + 4 + 4]; } if (flags & 2) // ANIMATION_FLAG is on return 1; - } return 0; } @@ -84,13 +82,9 @@ static int flush(AVFormatContext *s, int trailer, int64_t pts) unsigned flags = 0; int vp8x = 0; - if (w->last_pkt.size < 4) - return 0; if (AV_RL32(w->last_pkt.data) == AV_RL32("RIFF")) skip = 12; - if (w->last_pkt.size < skip + 4) - return 0; // Safe to do this as a valid WebP bitstream is >=30 bytes. if (AV_RL32(w->last_pkt.data + skip) == AV_RL32("VP8X")) { flags |= w->last_pkt.data[skip + 4 + 4]; vp8x = 1; @@ -149,7 +143,14 @@ static int flush(AVFormatContext *s, int trailer, int64_t pts) static int webp_write_packet(AVFormatContext *s, AVPacket *pkt) { WebpContext *w = s->priv_data; - w->using_webp_anim_encoder |= is_animated_webp_packet(pkt); + int ret; + + if (!pkt->size) + return 0; + ret = is_animated_webp_packet(pkt); + if (ret < 0) + return ret; + w->using_webp_anim_encoder |= ret; if (w->using_webp_anim_encoder) { avio_write(s->pb, pkt->data, pkt->size);