From patchwork Mon Nov 30 00:54:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24159 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 D06D8448983 for ; Mon, 30 Nov 2020 02:55:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B79BC68990E; Mon, 30 Nov 2020 02:55:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22177689221 for ; Mon, 30 Nov 2020 02:55:39 +0200 (EET) Received: by mail-ed1-f68.google.com with SMTP id l5so13359216edq.11 for ; Sun, 29 Nov 2020 16:55:39 -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:reply-to :mime-version:content-transfer-encoding; bh=O3twXQIbSNYd86rR0JVa7A3MCHdDw+koRR5f+C+sFJY=; b=Vj/K7CQqYQynp40nY9dfeoWKYh5EO4MhTzq3HPTfoyQPGGw/Of4eWdOeJEzLc6erUt bTQDX3DaqGlC+IXffAWI46Nl3JdM8Jy+tTxC5vPhQgZ1+HjK9c9eWSeJD8hAdUwwgEyK zKLYwMLzXb9my1rRYUjoEORipPRuPHXFRlC9zFv5KDzaj7SoHb/Zehx0iERKWinEXzX5 meiT9dzR/vDE3K21qQpFqwYIlePcoO/pCWTKVtYxBJVXOsY6AiFackKhsq8PlHqZ5RAb 72z1L7nkHcqeRftGjE5uEdIU9E8cWGe0eG+x7XfwL1fu0gh/z4lTAf5grwNjKCvNdBjF DGIA== 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:reply-to:mime-version:content-transfer-encoding; bh=O3twXQIbSNYd86rR0JVa7A3MCHdDw+koRR5f+C+sFJY=; b=uAFKuIuRWoMRzFlox+n5+XUGzJ1Pls7WEtaquUMMuHE+3axqXCHcXDBFVb687yu769 lRSeFgR/VlFpKARoX0WjL0ZjHiHvcPqb/3+6EJ7HKqN9Wz84hmR9JF9ZJIA7xPKHTS3O Z4MOl8o/F/bWYW4jkXBEodxVaLIwkgJJSd9PX9KlZ97xXnQmHxAbqT3W6pVrRcL/pf1z W4fQ4C+HNcFB1I9Q3orgKmlt8zn69wGYvF+U/qXJRMuDIf1zcvdgJHoBPYPXX4IyMKN2 G2vERgVmfB8GBqwGstWy3j3KbzNdZj2ldxyqZx9Hw8YRxY2ZiYfb52VGBAUpPpoS5/ZO 1w5Q== X-Gm-Message-State: AOAM531bf36E3O2qSW/aCGU9bfnkHyo55rvSsT+foYvXnuDoXwTHU0sU WVsY9veSvpFV4TCY39MuDjJyYJHRzOUSPw== X-Google-Smtp-Source: ABdhPJyoa/wJOzrjXRDBNWDK9HFfMQRS3U3DjaSVMWNUxXj0oqAAYKzTtTyEAr5v4bFdNi0iKJ5hWw== X-Received: by 2002:a50:8f64:: with SMTP id 91mr19249971edy.310.1606697738464; Sun, 29 Nov 2020 16:55:38 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b20sm3354993eja.30.2020.11.29.16.55.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 16:55:37 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Nov 2020 01:54:08 +0100 Message-Id: <20201130005454.110441-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 088/134] avcodec/iff: Reorder checks to avoid unnecessary alloc+free 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/iff.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 79f6215c77..21b69f6e94 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -299,14 +299,13 @@ static int extract_header(AVCodecContext *const avctx, avctx->pix_fmt = AV_PIX_FMT_RGB32; av_freep(&s->mask_buf); av_freep(&s->mask_palbuf); - s->mask_buf = av_malloc((s->planesize * 32) + AV_INPUT_BUFFER_PADDING_SIZE); - if (!s->mask_buf) - return AVERROR(ENOMEM); if (s->bpp > 16) { av_log(avctx, AV_LOG_ERROR, "bpp %d too large for palette\n", s->bpp); - av_freep(&s->mask_buf); return AVERROR(ENOMEM); } + s->mask_buf = av_malloc((s->planesize * 32) + AV_INPUT_BUFFER_PADDING_SIZE); + if (!s->mask_buf) + return AVERROR(ENOMEM); s->mask_palbuf = av_malloc((2 << s->bpp) * sizeof(uint32_t) + AV_INPUT_BUFFER_PADDING_SIZE); if (!s->mask_palbuf) { av_freep(&s->mask_buf);