From patchwork Fri Sep 20 20:39:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15188 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 5D70E4495B9 for ; Fri, 20 Sep 2019 23:40:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 499A968A4D4; Fri, 20 Sep 2019 23:40:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC0D968A4D4 for ; Fri, 20 Sep 2019 23:39:52 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id o18so8021989wrv.13 for ; Fri, 20 Sep 2019 13:39:52 -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=uKPJ7dFPuTrP7YfrCA/pmLeLjdhk8vK0yGgyuktkKuc=; b=fzH1Zxl1/7hO+z008HaAM7HQEqCWcFe/FCv70IIqQsfR6zQIdB4rI1sVBa9pWVGbVN Y0hBkR+i8tuCZgmMGHZle63Eu8vVuYttK7hRYkC3DNN93JE3p0oK15SW+8O0H86wRRKY xuyz62GKJE1cwZDGO9HTFCUiyV16WcJVmx6Vcph6i0O8Ni1I0cnyl0rLXSuJtPN3zolQ Gkou+BBC1NFKoMzE7oGLiNvKSUI9ZT+N0Sl0t+GCn4aZ2xeWRn7cwC+GYcnHHfc0R8EA 0dhDlFTkJ8+nP30hHz0UuN/cfm0g7S3yZCNPSNRLFGNYhNQ+zuc9I7D8u1QtwSa76KGu 4QDQ== 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=uKPJ7dFPuTrP7YfrCA/pmLeLjdhk8vK0yGgyuktkKuc=; b=VFzyKZkUeqzXRwDTbXPosC5ScyiIhSeHr+epZbBv2ye6r/cln4SwFd1OjK9HIRznc1 5skys8DpVQEFVdMXx70vK2pj26/JeLnO+ZVJgwHG1eTOWHJz7EaqFCizXTYJA87Egkhy 93KEhWcphhrSWatiHrXoOWwPt4GXnWJrXSmWKVW0bBRHWvdNjgB3PtBXcJ91s5iwF7O7 y6RtnThooU/P+rYAL99GJ76kjrQrfuPjVsJIAWH6qwT2ob8mlE9oc51lQckaxce+Xo7y KQ+m4rdHcspLBuqVvTzgyh0tk3kId9XNg60lZ1wTPz/v6BBGq45zh3riQZmxHqonlTEz YqRQ== X-Gm-Message-State: APjAAAXVzPxMRX85NgHtQqysbQTnMwingrfWLgx+L4sjFXklvArKXuVx IMO0KFDRaIapEHzS5FdWd3dh/Hih X-Google-Smtp-Source: APXvYqzyZSwnOHYK7c128lbH24FWVB+WcWqxHoPIm0tlQP9WUGVYOrsmMMEQlr5E9+ecZMp90k2ANw== X-Received: by 2002:adf:a515:: with SMTP id i21mr13764912wrb.185.1569011992190; Fri, 20 Sep 2019 13:39:52 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id m62sm3734041wmm.35.2019.09.20.13.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 13:39:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Sep 2019 22:39:08 +0200 Message-Id: <20190920203916.16904-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190920203916.16904-1-andreas.rheinhardt@gmail.com> References: <20190920203916.16904-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/9] 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 several 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 a packet happens to have an illegal stream index (i.e. one that does not correspond to a stream), it should nevertheless be unreferenced. 3. 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 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3983a3f4ce..652642a71b 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)) { @@ -886,6 +888,7 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) if (pkt->stream_index >= (unsigned)s->nb_streams) { av_log(s, AV_LOG_ERROR, "Invalid stream index %d\n", pkt->stream_index); + av_packet_unref(pkt); continue; } @@ -916,8 +919,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) @@ -1610,15 +1615,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