From patchwork Tue Sep 15 07:39:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22413 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 419C544A55E for ; Tue, 15 Sep 2020 10:47:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 247A468BC97; Tue, 15 Sep 2020 10:47:47 +0300 (EEST) 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 E562D68BC97 for ; Tue, 15 Sep 2020 10:47:40 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id b79so2372377wmb.4 for ; Tue, 15 Sep 2020 00:47:40 -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=i7+60Vnt5MMj/jyeBW6h7EzDyjBYJ6xu3ADEXrfRyTs=; b=EWEE3uLlvK4PAsUZPRnDCHqSOcRA4zf640lhkwt3W5gVqK/F93/VldR851/ztfoxPb cgiNCZjVHTAlwuf3Bf0xS3inIgB9D1JtrNEaCnvWc9/GDnvbUZQvYdGPKXXHUL41B5Bi PiY6H2evOPz2+j/ymEyIo41nW7JAyeyjoo7NP/z1qMO4ipUJsAv2S/ZuwRwS6DUQz6J2 yxxqqNNyZwOxbu2NY7RjRCgjm3iTCbi0AdvjmfU6IE96Tv6x+ISuHoXlYrdG5klq8NJS Kisou1M7iTCBJtJ72vTau4msIUjgx7drKpyS18AS8/orgeeRukiOdpNo1YBntRpWCJoT Ji1g== 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=i7+60Vnt5MMj/jyeBW6h7EzDyjBYJ6xu3ADEXrfRyTs=; b=hvLm6nItVGtwzGrZevHCAPJz3SfL7qikMRcmDwSO2/LEAMRwLBpycCsFEoFFzyvV8X 37m4i45KYShg62XaCg+vR40cmTVSTjlbTaK3HMCgC+xQXEFOwmtNYpFQVvLOigq71FFI 01a+k8mHhdVvNXpsl3/P6kEav3UxnbWt7eykD8xB9Mxd/xnxXh7/OAG5i3fcunJcpvxt wSJnd32j6E3AafWS+LDcrSFfet/mB5WpB0nCYdiW3NCTV68iVcsjhd+RFwRYqQ9wFXHM AtOnELm9WTnmzn9Gh1OH0yXbkAoursPGhrRvJTI8+eipNiV3O5BEad5GkqFiA1Xyd+To 3MRA== X-Gm-Message-State: AOAM533/Tbs0JJtmx6QmqMiJ0/RaK9Dk7YRWh1phQz/1l9U8BUZn6Tkv Na0PiGrhSmVeqzXxBIwbDAWpv4lfneo= X-Google-Smtp-Source: ABdhPJzhiEBzvA0QJly4pVqmH7wx07hVpytoeyy6X1SWdJsZyotN/lcFn8ghgf/M30vZ/eExwjsUzQ== X-Received: by 2002:a1c:dfc2:: with SMTP id w185mr3190378wmg.15.1600155628936; Tue, 15 Sep 2020 00:40:28 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:28 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:33 +0200 Message-Id: <20200915074000.102622-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/30] avcodec/flashsv2enc: Check allocations for success before usage 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 --- libavcodec/flashsv2enc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index 65db112696..e2a603f312 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -231,6 +231,13 @@ static av_cold int flashsv2_encode_init(AVCodecContext * avctx) s->key_frame = av_mallocz(s->frame_size); s->frame_blocks = av_mallocz(s->blocks_size); s->key_blocks = av_mallocz(s->blocks_size); + if (!s->encbuffer || !s->keybuffer || !s->databuffer + || !s->current_frame || !s->key_frame || !s->key_blocks + || !s->frame_blocks) { + av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); + cleanup(s); + return AVERROR(ENOMEM); + } s->blockbuffer = NULL; s->blockbuffer_size = 0; @@ -245,14 +252,6 @@ static av_cold int flashsv2_encode_init(AVCodecContext * avctx) s->use_custom_palette = 0; s->palette_type = -1; // so that the palette will be generated in reconfigure_at_keyframe - if (!s->encbuffer || !s->keybuffer || !s->databuffer - || !s->current_frame || !s->key_frame || !s->key_blocks - || !s->frame_blocks) { - av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); - cleanup(s); - return -1; - } - return 0; }