From patchwork Fri Apr 28 16:36:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1481895pzb; Fri, 28 Apr 2023 09:37:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6AI18PZrYRUDMacfc13O00oPLYhhIRGaVkX31dIPlVs0VreGdugdGnJsn1fU9fjaanZOe0 X-Received: by 2002:a17:906:ef0d:b0:930:b130:b7b with SMTP id f13-20020a170906ef0d00b00930b1300b7bmr5363658ejs.6.1682699835838; Fri, 28 Apr 2023 09:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682699835; cv=none; d=google.com; s=arc-20160816; b=VmfjBWMw/MIHyEIJ4kP6PiK8IcyIYR42uCm935aSRpBY7G8B74c8Ndi6M+Czdqx6F/ 1S8nrve0Zg7CpFPADOiQVRCfJcSI9yIkoArVsTnbaqhWGev8N6TUbMrGHNIVGETF0//J 021K6dspVd7KhN6s3pO8JalL+OmqLUa/TC3OhuQdHWzM28kpTwrQKm7DKtq4owH9wKxz Yhfh9D/tuSAc0oyrML7OxbBH7R9/MX4NgbClUvmCQW0V+Eu7uFWwMeC6Aq7lOfRNreKE kBMeBeYp92++NzUtORgvaKTHRPWRLLe74Y8K876zduR7wkH4fLqjqb5wY6qyNHnVAHrW n8LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=KyRGVrbGsFNlmTrnPg49ACk6wdfk0n+BnBxv95optqA=; b=cyVmtBlgeQn6CFHKfnY6IXX2b0Qo2N1mNVUpLad5znkRnSICuZGPf7gYYVUz99YxEs dUXZXT3IhBtC2NV43nLXC2arnU/0O8Y/qZSpHxjEdDP/LjT3+pzV/vb9og9jSnG1gTR9 J3NQ0rIdJbtDcTdQkuXEcY9OXuvZ77fU+BRZGUmn/ZREbvyEALyBjeRgos55O5aZO809 NtdmoOQAcv3vcespJKQUCxzcspmykcOJP4u4u3NsqRO6lqhHQdtLA1f4H4lib94RG+wO wq2G4HcSBV0k6oOSipjixE43Q+2urEpjHPnFa1fTPBTGqZv/KEI0/GHcjlic5x1OTXVw b/bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ae5UvBF2; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a8-20020a170906274800b0094a75839eb8si15824059ejd.706.2023.04.28.09.37.15; Fri, 28 Apr 2023 09:37:15 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ae5UvBF2; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 941E968BF06; Fri, 28 Apr 2023 19:37:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 087F868BF06 for ; Fri, 28 Apr 2023 19:37:05 +0300 (EEST) Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-18665c1776dso142439fac.2 for ; Fri, 28 Apr 2023 09:37:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682699823; x=1685291823; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=dZFo5ReKBwZxjgqrdg+LXFZ4zLszDnCeLqe2U4RltkM=; b=ae5UvBF2QLJFpbVGRsDYppfGw59Vh31xhL1A40EV2zuMECDzxi78RUn/E9gvjXSpVP +N93NzOzLoDI45+Px7f+KZvV1fYYiKkU3QLG/XD40p4kO8aqAtyx3ljle/mOIo8MlB2E +QVpRMD+Q3bepJ7uGbLRDI2FG0tmRvJ3WDT4RZjAPR/CCvD8Iai+GUgCtKXglL2DDEyq 3/4Oyj32VsTfYP2z+CwB28tNfRUeWucNBu8m4tHCjVyYlNpgDgM9Lms1X2xC+GI8Qveb iXLGZ4bgw3tslxC9/tZQw34XngpOOzVOPF8hbKTBDlvUk4CGzsdi2+5tLljIAWaua6PJ aquw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682699823; x=1685291823; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dZFo5ReKBwZxjgqrdg+LXFZ4zLszDnCeLqe2U4RltkM=; b=Mr+9ivnmFJvkKCZ2+EuE2r+uAqx2+Y3o82OHNWNsRpDnkXNWXcwTHwQ0MPtW6omEqK OhA80U5/KeYp1AgGUpoG1tekxAkRGcZLouIkjR0LSTpw6CMHlP+C9mRbtIVOfpsQiL4q lpHUmrL6Kql16C9ssk4OAIHLgmpbn9qkgIEEAU/Pni49ocMnzCnZTHIJKStWjUI0y6pW QXJ3QaZ61wDPgqSf8TqD5k8YWvSGQs7j4lcxVlKq65qIXcbcYUZSLYdTAzb4irNEP9WN dHR5Mssz4nwA2i6dOUGwgpP0mZjgrVe7uvP5wyT48l5lw6MX/9dOpvuHPsuFiJvV+NPX 7hiQ== X-Gm-Message-State: AC+VfDw8g0aPUZNfzOLgoZGqaPWKJbLzbkOim1QBapgYH7rY9Ophobqa FlEnloH8u1mp1P/dFOgCW/FEcbXE+9U= X-Received: by 2002:a05:6870:1a90:b0:18e:c8ee:1186 with SMTP id ef16-20020a0568701a9000b0018ec8ee1186mr3133619oab.19.1682699822888; Fri, 28 Apr 2023 09:37:02 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z16-20020a056871039000b0017264f96879sm7627763oaf.17.2023.04.28.09.37.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 09:37:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Apr 2023 13:36:39 -0300 Message-Id: <20230428163639.1573-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_filter: fix leak of AVIOContext in read_binary() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BDsgO+Ea5/99 It was only being freed on failure. Signed-off-by: James Almer --- fftools/ffmpeg_filter.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index b26160b375..161ea9c866 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -408,11 +408,13 @@ static int read_binary(const char *path, uint8_t **data, int *len) *len = fsize; - return 0; + ret = 0; fail: avio_close(io); - av_freep(data); - *len = 0; + if (ret < 0) { + av_freep(data); + *len = 0; + } return ret; }