From patchwork Tue Sep 24 16:31:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15261 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 2F240448D73 for ; Tue, 24 Sep 2019 19:44:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 00E7D689E39; Tue, 24 Sep 2019 19:44:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 711246881D4 for ; Tue, 24 Sep 2019 19:44:15 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id 7so945625wme.1 for ; Tue, 24 Sep 2019 09:44:15 -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 :mime-version:content-transfer-encoding; bh=ZJtbAvH+E6/fWq5IXfo8r+GH/x8ewgTaz6kI/JEKLG0=; b=Zf/1HR62vW7GFzV003Azl52O+8fPmycLWIMv+np0hkrxyidcK2kQvGYrz1eo9+nT0A y0owgI0brG9yYcnJin33K73cvEJE6DwBEgqGVEl3vPkmD3RyXMIoAriyJZP8V75vjMAR YtRYUgjfwqMOsrmCCRlIQv4lDlPGh/UX/ZZn9u4/5VnRAiQH6JYWg1HMOfeIapnmh4f/ HjGvUJd1UjoW0Y0umuz2Dr5fyODb/yiHt9KPdrv3S/A4obrwCqUPhQevsa1miprDJ2Gc J6xfzmFMe/7OIU2NbiFb0FBZcnryWz7HlsCp70lHmz8pzi7uXm1t/nUM/Su4LNKR8Ru4 Ek2g== 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:mime-version:content-transfer-encoding; bh=ZJtbAvH+E6/fWq5IXfo8r+GH/x8ewgTaz6kI/JEKLG0=; b=LkFoZN/s+Y1d9jAzrmWgPtdHa+kv+9C/rpAEH+VYC3WRje8/HiRriasTHm6bNAHAlT F/YQO38Lg3ow0+8pxI3MpT+DG6EuPxC2WVUSs+5KvdAk6N1KNYVzskgia5JoNt1Q/utV ZWuJwgaJEkBuw7N7irdGveOouyrzGqVSGSqNwenvuE4Yu7kylcWiZA/hoyOsyG4CVu5L EqGTbflieDVfIJD+dRouJlQkMkmKoh9hW7jCunI5htV5K92/CuTPc2CIh2XKctrtW17Q AoQmi8/HcKVtHFl52RC3fmv3JHHkK1NYHJK4EGIN78j9Iqb3S63cD4nXM1r2PrzcGdUR i/uQ== X-Gm-Message-State: APjAAAVqvyPeOOKhe5kOS7wSuLY2dzmjgO978IynamXDU2IOBfxCfyb6 pdG85n7Bia/F5759Yiawdk9XCbSm X-Google-Smtp-Source: APXvYqzfj3nEGTrHUvr8lF2sm/OM+SEgQ7Da6DBxWHLJrsmwUW23H+xb4ClqWHiKt2dNbCnCrEFjxA== X-Received: by 2002:a1c:a7c6:: with SMTP id q189mr1047085wme.22.1569343093531; Tue, 24 Sep 2019 09:38:13 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id y13sm3925434wrg.8.2019.09.24.09.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 09:38:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Sep 2019 18:31:44 +0200 Message-Id: <20190924163144.26443-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924163144.26443-1-andreas.rheinhardt@gmail.com> References: <20190922125543.GW3219@michaelspb> <20190924163144.26443-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/utils: Fix memleaks 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" ff_read_packet had potential memleaks: 1. If av_packet_make_refcounted fails, it means that the packet is not refcounted, but it could nevertheless carry side data and therefore needs to be unreferenced. 2. If putting a packet on a packet list fails, it wasn't unreferenced. Furthermore, read_frame_internal leaked a packet's (side) data if a context update was required and failed. Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d8ef5fe54c..ff6aecbf3c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -872,8 +872,10 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) } err = av_packet_make_refcounted(pkt); - if (err < 0) + if (err < 0) { + av_packet_unref(pkt); return err; + } if ((s->flags & AVFMT_FLAG_DISCARD_CORRUPT) && (pkt->flags & AV_PKT_FLAG_CORRUPT)) { @@ -914,8 +916,10 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) err = ff_packet_list_put(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end, pkt, 0); - if (err) + if (err < 0) { + av_packet_unref(pkt); return err; + } s->internal->raw_packet_buffer_remaining_size -= pkt->size; if ((err = probe_codec(s, st, pkt)) < 0) @@ -1608,15 +1612,19 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) } ret = avcodec_parameters_to_context(st->internal->avctx, st->codecpar); - if (ret < 0) + if (ret < 0) { + av_packet_unref(&cur_pkt); return ret; + } #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS /* update deprecated public codec context */ ret = avcodec_parameters_to_context(st->codec, st->codecpar); - if (ret < 0) + if (ret < 0) { + av_packet_unref(&cur_pkt); return ret; + } FF_ENABLE_DEPRECATION_WARNINGS #endif