From patchwork Mon Feb 22 09:32:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25890 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 E376A44B573 for ; Mon, 22 Feb 2021 11:33:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDD2A68A995; Mon, 22 Feb 2021 11:33:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A85068A957 for ; Mon, 22 Feb 2021 11:32:57 +0200 (EET) Received: by mail-wm1-f54.google.com with SMTP id m1so13672956wml.2 for ; Mon, 22 Feb 2021 01:32:57 -0800 (PST) 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=3LQlmiEzgUqpjzmT/ZxIdTD/17oM3Ur648Ke3R8PdOA=; b=cMig+x+e6JxaMzScBE8/YrqDvcQtRR57USUf2Xohh9+R9oUdk5qt3zDzMBFbj/NfEr S2qyu6O1HayxUXtKBpuro3AkYQ67AozVuSXCmz17O8c+YHOvwHGHHw5cKosXCfmo6MVz kYiASAb7bPcfc7EkP/oY218/V43xCSKAN9hoDUrBr57LznFBXp1rBZ2I7OlVw1wIEKt4 7NPLihu6FvUUa4uwJEE5yW02gZMaagcKlv27zJe0Wck8HDbaFtu8lAcgIDj0KDMB9NqN Cv7/QhuE3RwObXNEjZ+kkbDFoQfuCi3hTHIbR1ZKeQSKSAPUJgGZpGEePN2nmg5W7nyJ zFpA== 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=3LQlmiEzgUqpjzmT/ZxIdTD/17oM3Ur648Ke3R8PdOA=; b=LoV8touQaNEkDbF06hZKXb13qcErYCAyZvmf1OsBNJR9Ovg5mnpN5//yxF9XDTPUN2 gB4FH/FRNpcHV9XoOswSmH0dYQ/K92aSMy84lg2cwEhV5ENn5qL3kwcxibiX4/qGZAba LNdUmHJ7dSYBm5ap26mm16GnUBAKzzMn+aVMIUD+zvLG6ZCJXEF8YVPBAl5gi5VhGpX8 mRVcY/AUuINDMkNVNym3t6T9IxiLvt6CMuMCtwKadaPOxyzSZUlfl4hWtmuBGacfxCO6 c/Wi5ymVDTvhC8Y7mCxD3BKVYEHjHkqwzfHEetj+QEaPs+ermuR84rG/LbUYLVx+du67 5eUQ== X-Gm-Message-State: AOAM532oSEygaDKmGYcwCTvJzBOEQkWEtUreYcmCCMN2i3ysjqjcjQqP 8qeVbs6VqOfRZkDThJBA8InD0Cb3Y0Y= X-Google-Smtp-Source: ABdhPJzG38fCfGGXM/T8Q1JY0QSdkNotDDEbNCF4EPrADYC4VKOZRpvgAWGyH8A+c63dnSfzQ2Gt5w== X-Received: by 2002:a1c:e402:: with SMTP id b2mr16861193wmh.103.1613986376676; Mon, 22 Feb 2021 01:32:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d16sm5284924wrx.79.2021.02.22.01.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 01:32:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Feb 2021 10:32:33 +0100 Message-Id: <20210222093234.212078-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210222093234.212078-1-andreas.rheinhardt@gmail.com> References: <20210222093234.212078-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/spdifenc: Fix leak upon error 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/spdifenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 0288872fd3..c3ba3a1a19 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -122,14 +122,16 @@ static int spdif_header_eac3(AVFormatContext *s, AVPacket *pkt) IEC61937Context *ctx = s->priv_data; static const uint8_t eac3_repeat[4] = {6, 3, 2, 1}; int repeat = 1; + uint8_t *tmp; int bsid = pkt->data[5] >> 3; if (bsid > 10 && (pkt->data[4] & 0xc0) != 0xc0) /* fscod */ repeat = eac3_repeat[(pkt->data[4] & 0x30) >> 4]; /* numblkscod */ - ctx->hd_buf[0] = av_fast_realloc(ctx->hd_buf[0], &ctx->hd_buf_size, ctx->hd_buf_filled + pkt->size); - if (!ctx->hd_buf[0]) + tmp = av_fast_realloc(ctx->hd_buf[0], &ctx->hd_buf_size, ctx->hd_buf_filled + pkt->size); + if (!tmp) return AVERROR(ENOMEM); + ctx->hd_buf[0] = tmp; memcpy(&ctx->hd_buf[0][ctx->hd_buf_filled], pkt->data, pkt->size);