From patchwork Thu Oct 4 23:09:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10550 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp1467105uaq; Thu, 4 Oct 2018 16:10:22 -0700 (PDT) X-Google-Smtp-Source: ACcGV63CNbJGrlMHMEhB8NxHK2gzPYFM/5zO38bPjv8hsrc8igci2q3+AVuROliZuIOG5pD2J/Km X-Received: by 2002:a1c:8942:: with SMTP id l63-v6mr6299058wmd.66.1538694622644; Thu, 04 Oct 2018 16:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538694622; cv=none; d=google.com; s=arc-20160816; b=DhosiZl2UcKJTNTzQB5uSn/T7XkafNZ0A/0yLSDm2R698HMym1E15CPUf9wmNlY2CY y49ur7iS/jV8GvRTmyyg2jX0UZhydoOKpK1Hmdr/7aiZVzPryPRUacQPu/4wvAkcfwUM evMT9pW7H6xU6P6+aITtG7gdDXm5amUa62IW54iIlb5hpX00MdHBQV6nFWRFn9c8FHZL Wv6RGB7dNNGOrmKFlNZJcYu0w6aVKW1EPJxgaJg5tl/XrDySOo/hS2M6S6XjRitaS23Q 5AzV+sX064jb0HOEseSplkOL3nX+njJiQqrh6lKIKAdkNT2tLvuaWa28LZjBmovC8oez DWYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=GSNU3QLPCfVvfz+I/BHj9Uj0SlkJiwbeTv58lyPp1lU=; b=Ath83twnpmxhxHUFYHMlV4M2flkBaz4ldqGaDDCFOfgsh59FrO2290IdDKZLcF5fFj xo9wZV2ltof3iAT8Fkz6H9SQe2jRhqTFLBI5gLtXVlkxMAHk7WLIO2QqmjRQy4nTvESC fvu6NMbIbucGsFRPzRPDnkQ8g9BdYw1i2/WrMZE2eMuxr/1xMEdaJtHWX+C609QwpbV+ aMoq5k4wj//GWFFoApjs5iRjrWZgNhcHoNVbC1E8XNbrax06PDl21N61yPBBwbuSuJ/9 SIgQbaPsp1gCsvxKV/82q/2/V3aHaERV/wEUpr4fjncK2qqNmIJnlEVUGcBki8t90p+l jAoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b="YOEz/mV1"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t9-v6si4242757wrq.111.2018.10.04.16.10.19; Thu, 04 Oct 2018 16:10:22 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b="YOEz/mV1"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A88A68A47D; Fri, 5 Oct 2018 02:09:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A84F68A39C for ; Fri, 5 Oct 2018 02:09:34 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id n1-v6so11613817wrt.10 for ; Thu, 04 Oct 2018 16:09:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=tMzqR5ImWF0qY6J3aMIOBzCD9oibg/Mfa1gBQ/WV5DU=; b=YOEz/mV1VsArcRoeSiamVS3jATyIt9jWr/z6QaohU58lDeSoc4lDVpxEvRuIx5l0ib sRJnecaeWzgReZjXQWxYIdWD82pc5VVcJ9kQSJRreVXuPH2ZV6yWgalceK5qXQ3C0fxH p+zfYOGA8VeZLsNxmvkxi67cWXo/MWUEG+Nbc/cvj3a+qaEhfH4CSQtjpLrlfbZ5yI6U dp3Q1vX7mMetHRNbaMUnwXY9ft+LpicMGWT/zFsopxM83XbgBHfeFBHa5XFuzdcw3oPn gLTPMfw/OwLz2zUcBgcroZEBVMyFJq7bPjQ2YNyl2u5JGo3zY/Q9PAFu/pG2UIKPyORK TLiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=tMzqR5ImWF0qY6J3aMIOBzCD9oibg/Mfa1gBQ/WV5DU=; b=dD4IPS1cuyjJgdDAbr5kLh/lMexE5ZeHlMfIARJh5gOvB8Aekl3zgHKXNzIfvxNPZF hmQLTRXkhylnq7klTubbNGls+krcgnXHE2Ax3GD/IlOVqgn15OreeuKcd6Hh+yPeFFOW 6YF71UJfn1Qw9VH1s5SPW2tLPz4q04Q8SWC+HPFWCgJeIzw2fysSNsZfMg18s4VSZtiR 2FHOWcqZRLlxFILDIrX+4e+6kZ0ZIopEXxj8gNT5embxHXlTiMRiAhH2j3Lum8Vw9LRk tVMyIt4RP1/q/lf+uYmDxa9sV2u+Y1f8fH/i3DYBzxsAHrR08179GDdtKjS+uIQRUuV8 6IXg== X-Gm-Message-State: ABuFfohmeWpkOXdcktxdcqVHkrfeG5QFNJqnXt4hfa8BNpKuEqwwEanC IfND5/xQTMVvtQGdl/+E75Jsu3sGHcA= X-Received: by 2002:adf:9244:: with SMTP id 62-v6mr6144564wrj.130.1538694594099; Thu, 04 Oct 2018 16:09:54 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id a105-v6sm11822006wrc.23.2018.10.04.16.09.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 16:09:53 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Oct 2018 00:09:45 +0100 Message-Id: <20181004230947.9658-3-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181004230947.9658-1-sw@jkqxz.net> References: <20181004230947.9658-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 3/5] trace_headers: Fix memory leaks on syntax read failures 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/trace_headers_bsf.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/trace_headers_bsf.c index 94a3ef72a2..8322229d4c 100644 --- a/libavcodec/trace_headers_bsf.c +++ b/libavcodec/trace_headers_bsf.c @@ -49,15 +49,11 @@ static int trace_headers_init(AVBSFContext *bsf) av_log(bsf, AV_LOG_INFO, "Extradata\n"); err = ff_cbs_read_extradata(ctx->cbc, &ps, bsf->par_in); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n"); - return err; - } ff_cbs_fragment_uninit(ctx->cbc, &ps); } - return 0; + return err; } static void trace_headers_close(AVBSFContext *bsf) @@ -97,14 +93,12 @@ static int trace_headers(AVBSFContext *bsf, AVPacket *pkt) av_log(bsf, AV_LOG_INFO, "Packet: %d bytes%s.\n", pkt->size, tmp); err = ff_cbs_read_packet(ctx->cbc, &au, pkt); - if (err < 0) { - av_packet_unref(pkt); - return err; - } ff_cbs_fragment_uninit(ctx->cbc, &au); - return 0; + if (err < 0) + av_packet_unref(pkt); + return err; } const AVBitStreamFilter ff_trace_headers_bsf = {