From patchwork Sun May 24 00:25:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19822 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 3B62644BC3C for ; Sun, 24 May 2020 03:26:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26A8268A303; Sun, 24 May 2020 03:26:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17098687FA0 for ; Sun, 24 May 2020 03:26:28 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id j16so1453718wrb.7 for ; Sat, 23 May 2020 17:26:28 -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=0QwdOCwW7anCSbqp4tn/7E3tGtsJ8h+dkHeBotJF7AY=; b=qA3LDDLkqWkj4L3fOTS558cZ1pFX2Q3NYBEd9YSoE0wFK5emYbOp3H6d4hzPy0HiXg gPMM41ZVputyi8ZmADr8qoF+kt12CBD0yDKGk4dE6gggSHhVTY2PgswhkMn3lsn4mRBR vU96JbbVW6fFTwVO8rywAqMDmLhuDqLC99dyx4Isp/bhGEEWyw9tx3s/en+3DU0XkFJU MK26n9/Rk6Yj85+CcqJul77g/I3EALbVOxL/JSdTtjateodHRRdUH0HkxPcNjO3XJ5Y0 r1v6bLkZtnmKoGJVW/HDTP4RlD2U4id/gFhpGRtkdHutReoV+mHFTtxETnpyYV4f2nee SbRA== 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=0QwdOCwW7anCSbqp4tn/7E3tGtsJ8h+dkHeBotJF7AY=; b=WnvFnHKY9uOzWvVyTc8/3Fk4TqZTTsahO2lyB6tj9jWz6T/AQdDyEhLdMgUSf6bVi0 Y3pROdX7bkgHCrYtqKVg5s/ykFCGuDazvkB9VfeqkIvds5GjwNFt1dDryDcZb+M3D50u d0h8eieM19CWcg7/OMz0fwMcHcrEHV4UYEnssvUZ9piZfw2AWSqOp+T47vuW/SSUp8Va tu6X5jwar2wR0STwy42E/juK13RlOU1FkFLLTp3WqnIO45K3ykuPPf5rT2/d4jIPnE5X z5lu7gY0vqL/JFB3zjbqYsj7yueXahwcZVJWo+/vroxOg3SB9xYvbeS5dXhsIXfTcJkU pu5w== X-Gm-Message-State: AOAM532H8RHXeqYCCIN1PjcJzLMPF2vyEs0QMaiRE1+NOBb80SsU+zIl 8tHCMl9F6e1JrINL6IsYCwek8+Il X-Google-Smtp-Source: ABdhPJx2BTaZDIzRohyhI8a8uXpK2g1KteVnKp5I1PRWDxhAnOJqSzf1MGcDuXo5hDaxgajHhUtbuA== X-Received: by 2002:adf:b34e:: with SMTP id k14mr9175582wrd.109.1590279987287; Sat, 23 May 2020 17:26:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id l204sm3722158wmf.19.2020.05.23.17.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 17:26:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 May 2020 02:25:54 +0200 Message-Id: <20200524002554.28064-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> References: <20200524002554.28064-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/oggdec: Avoid duplicating buffer when adding side-data 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" Signed-off-by: Andreas Rheinhardt --- libavformat/oggdec.c | 12 +++++------- libavformat/oggparsevorbis.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 1a3acbb55e..b4ba00df61 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -877,14 +877,12 @@ retry: } if (os->new_metadata) { - uint8_t *side_data = av_packet_new_side_data(pkt, - AV_PKT_DATA_METADATA_UPDATE, - os->new_metadata_size); - if(!side_data) - return AVERROR(ENOMEM); + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_METADATA_UPDATE, + os->new_metadata, os->new_metadata_size); + if (ret < 0) + return ret; - memcpy(side_data, os->new_metadata, os->new_metadata_size); - av_freep(&os->new_metadata); + os->new_metadata = NULL; os->new_metadata_size = 0; } diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 27d2c686b6..f09d54488b 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -287,7 +287,7 @@ static int vorbis_update_metadata(AVFormatContext *s, int idx) os->new_metadata = av_packet_pack_dictionary(st->metadata, &os->new_metadata_size); /* Send an empty dictionary to indicate that metadata has been cleared. */ } else { - os->new_metadata = av_malloc(1); + os->new_metadata = av_mallocz(1); os->new_metadata_size = 0; }