From patchwork Sat Mar 21 02:57:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18311 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 0255344B5FA for ; Sat, 21 Mar 2020 04:58:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDD7668B4F1; Sat, 21 Mar 2020 04:58:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FC8168B487 for ; Sat, 21 Mar 2020 04:58:08 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id d1so8418260wmb.2 for ; Fri, 20 Mar 2020 19:58:08 -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=4vOErOaUEVluVRaIgBSSFEWtvPByzp1/R84x8fyHvgs=; b=pOfVui3ZojU8W3zVJtum1Og1AgA0Oo7tkZzAfFY6w2lGcNkzbMYmMbksoGELXJLEjy G1TkvW3h+pG4+2ckmmnUCNrg/Ye9JrHUUR4pndQEp6bhogIZbQTX9JYV7gaP5leNux5V A9kb4f9HxHHykI2wjbEJCyVpdDfsojNKdSU9e1wmOEnw0k4+22sDdqLnn10cHcD1aLmD Xr5WWfNLQbB6AX2JG/epGv1nYKlkXZeENKcG2tU5pvR1EeaNmkW2KhiQqdr7Y2fH8g8d ZEZNOxJJ0kCbXa/i3ShU0cyB7pxvMBamv4l/B6aBr4tqFCGDU4uMd8b1owl6Fjvsgfch W4nw== 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=4vOErOaUEVluVRaIgBSSFEWtvPByzp1/R84x8fyHvgs=; b=hIcemByGoGZkR8x5g1ErrVUBZgIAjWSU1v0KXI0HHNV8QycIT8tLrndjvOwwWiJTlM 6D77wLyOEoQ+sRtWEbyePILrD1SInSEBtjzd5lK5l4KR9XV2sFJ0+WX6msZ8+FhKTHaA v9j9sR5/LvKzuk6J7SkoNjywytr9XCa4YBpv46f8DlTEPIjslLXCbpi1K5DiQuLHnxwR X6jA8SqHuQ+Ga62NkWLUUb4/9ZTqssT55ShXOUl+js64HJ283gsWI46xHBGDMKIyJNyc ZZwDZ/MhjK9XYYRz+w4TlSLTEhBiKYx5e7OmgNkTitaanol4ksme/eb2xlMbm9U4TxQq s2MQ== X-Gm-Message-State: ANhLgQ2wdLxoe0GtY73I0MwNhmTb5gD3YdkddkbGdEl8Rwa/xv3KoqbM fXvCKuT7HTtdRsEqWGK79vP7+7BE X-Google-Smtp-Source: ADFU+vtbDX2aF3/Fx+4vN42wc79A/M9O6APai/UJjUyRBL1UGkmtb4ENnZi7tmFNLJmENBqcxvs3zg== X-Received: by 2002:a1c:a5d4:: with SMTP id o203mr4760788wme.47.1584759487277; Fri, 20 Mar 2020 19:58:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id f17sm11756189wrj.28.2020.03.20.19.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 19:58:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Mar 2020 03:57:32 +0100 Message-Id: <20200321025732.7614-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200321025732.7614-1-andreas.rheinhardt@gmail.com> References: <20200321025732.7614-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/bethsoftvid: Fix potential memleak upon reallocation failure 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" The classical ptr = av_realloc(ptr, size), just with av_fast_realloc(). Signed-off-by: Andreas Rheinhardt --- libavformat/bethsoftvid.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index e52b17433c..c54c54325a 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -147,9 +147,13 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt, } do{ - vidbuf_start = av_fast_realloc(vidbuf_start, &vidbuf_capacity, vidbuf_nbytes + BUFFER_PADDING_SIZE); - if(!vidbuf_start) - return AVERROR(ENOMEM); + uint8_t *tmp = av_fast_realloc(vidbuf_start, &vidbuf_capacity, + vidbuf_nbytes + BUFFER_PADDING_SIZE); + if (!tmp) { + ret = AVERROR(ENOMEM); + goto fail; + } + vidbuf_start = tmp; code = avio_r8(pb); vidbuf_start[vidbuf_nbytes++] = code;