From patchwork Tue Apr 14 03:39:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18939 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 944A2449BE3 for ; Tue, 14 Apr 2020 06:39:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6381368B9AA; Tue, 14 Apr 2020 06:39:23 +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 92BD868B9A7 for ; Tue, 14 Apr 2020 06:39:16 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id i10so12612606wrv.10 for ; Mon, 13 Apr 2020 20:39:16 -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:mime-version :content-transfer-encoding; bh=RGHsigM8t+ihCrpoUe3vU07BbZXjtdOTCleGqIuNrVk=; b=bUNFgmDakMUl3X9EFs2gt5b4i5tq8xJrHTArjRnVEuS1YIA0KBdMgaYvgnkTozhPYl xuyTaW07hLOCzTGIzUm/IL7UmKaoDc+G7OOybPAZm4QCbId9Z7+9mPpXSXTB7JqiEWdm wtc8mSpLtQ8tEv+3Zpcjd1R/ZOIHpWxygx8+Uk0AL+NCupUtYg+dGX+jfN5b542qOnaw 8ObsLvKdHst1HM7cwY+g44ffzRteVpQkZbCKiaVbsntXzTaPt0KXI6zTbQiX3YtwW7gF w1Fken1sk4/39IIP6c1HZWg5wL4DizExSEKiZ+xQq8IR5HdZDSV3o9WR6gW+CZ+3kprL CDgg== 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:mime-version :content-transfer-encoding; bh=RGHsigM8t+ihCrpoUe3vU07BbZXjtdOTCleGqIuNrVk=; b=bkTAAJAulTHs2z0diKpc+MOdKzfJqKxfbwUpwQNYWO1D+4/bq2ji/NpJSkRwl6tU93 t/TngoK/YPrM12OXBwNIy+lNm443fZfnQz5eGL1o5slbGKkUDj4Vm/bcfEhuv68TCpOW HCDcFZMU/xXgCj+USON2zhHmcmC/ZTn2F+XJXVoiaxzG2h+zgTnsWzf50C3jCOg1RrQi NdGTNygyYGC3cwifD9WEjdSJaTmznjD2VJvIvw/5DA/ZZZ7i0d9U9Jzr79WnXk/lPTis vheFFF0nYLbSPb4Azi2BLqDXR3HgWpkRlS+1bcCD91GZvFle3m4g5AQ80GJSxP2vEvvx WCgw== X-Gm-Message-State: AGi0PubNPfSWJ9A9JGK1Dd0IBlrLN6d0mVKBKy/tjkY4+L4+5GCKK4eJ s3gcCb16nOEkrTtlwOlXdQLEY6qM X-Google-Smtp-Source: APiQypI+Ge1nkIM2nbjCQsDnNc/80GPLZdk3+3nRdV8WgT7Wyr2Z0VVsg94xDFDjUnA9hCLY12X98A== X-Received: by 2002:a5d:480b:: with SMTP id l11mr23486031wrq.25.1586835555602; Mon, 13 Apr 2020 20:39:15 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id d24sm17879926wra.75.2020.04.13.20.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 20:39:14 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Apr 2020 05:39:07 +0200 Message-Id: <20200414033907.31625-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/oggenc: Don't free AVStream's priv_data, fix memleak 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" For FLAC, Speed, Opus and VP8 the Ogg muxer allocates two buffers for building the headers: The first for extradata in an Ogg-specific format and the second contains a Vorbiscomment. These buffers are reachable via pointers in the corresponding AVStream's priv_data. If an error happens during building the headers, the AVStream's priv_data would be freed. This is pointless in general as it would be freed generically anyway, but here it is actively harmful: If the second of the aforementioned allocations fails, the first buffer would leak upon freeing priv_data. This commit stops freeing priv_data manually, which allows the muxer to properly clean up in the deinit function. Signed-off-by: Andreas Rheinhardt --- libavformat/oggenc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index fe89f23e36..fbd14fedf9 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -546,7 +546,6 @@ static int ogg_init(AVFormatContext *s) &st->metadata); if (err) { av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n"); - av_freep(&st->priv_data); return err; } } else if (st->codecpar->codec_id == AV_CODEC_ID_SPEEX) { @@ -555,7 +554,6 @@ static int ogg_init(AVFormatContext *s) &st->metadata); if (err) { av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n"); - av_freep(&st->priv_data); return err; } } else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) { @@ -564,7 +562,6 @@ static int ogg_init(AVFormatContext *s) &st->metadata, s->chapters, s->nb_chapters); if (err) { av_log(s, AV_LOG_ERROR, "Error writing Opus headers\n"); - av_freep(&st->priv_data); return err; } } else if (st->codecpar->codec_id == AV_CODEC_ID_VP8) { @@ -572,7 +569,6 @@ static int ogg_init(AVFormatContext *s) s->flags & AVFMT_FLAG_BITEXACT); if (err) { av_log(s, AV_LOG_ERROR, "Error writing VP8 headers\n"); - av_freep(&st->priv_data); return err; } } else { @@ -585,7 +581,7 @@ static int ogg_init(AVFormatContext *s) st->codecpar->codec_id == AV_CODEC_ID_VORBIS ? 30 : 42, (const uint8_t**)oggstream->header, oggstream->header_len) < 0) { av_log(s, AV_LOG_ERROR, "Extradata corrupted\n"); - av_freep(&st->priv_data); + oggstream->header[1] = NULL; return AVERROR_INVALIDDATA; } @@ -755,7 +751,6 @@ static void ogg_free(AVFormatContext *s) av_freep(&oggstream->header[0]); } av_freep(&oggstream->header[1]); - av_freep(&st->priv_data); } while (p) {