From patchwork Sun Sep 13 02:57:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22327 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 575A5449E91 for ; Sun, 13 Sep 2020 05:58:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B40A68BBF9; Sun, 13 Sep 2020 05:58:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5626168BBE9 for ; Sun, 13 Sep 2020 05:58:37 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id w5so15041919wrp.8 for ; Sat, 12 Sep 2020 19:58:37 -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=liAYWGHrLLAxMClsQeq/oubxxvn21qy7t3k/REA8PX0=; b=JuT3HWA4R7Z7cVD9jBGQb3Am3bhlzjmSXHBQBesm1ZqeSO5NuOcutrCG3vsvRxAyll qmr+BvJ4OcXP+Q5mo4tniO8QUls8SPKLndHFum69j6HKuPSSSnnVICVQbJ+kpO3fEP/l kPCRYjFPY+3UAelOro7Od206POcEF/uACf32p9lQwCgq+R+6PTQhOgFIPV6ih/LfGFyw iL9suYSSb1gkeG4kfMoT3yE0snoYYfIfIUcCZFHHCUIX6oz8mSNKqri6NBI4XvqBYBfI Hf94UX3WPK7Xjex1jr/qKJKWZ1m5mx3jIXI+ac+OaoSh/cZJC4q/4VSsyql7MQcjuByE tbNg== 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=liAYWGHrLLAxMClsQeq/oubxxvn21qy7t3k/REA8PX0=; b=l50RlLkCWZf3N39LzzsKcU26611MUwkkcHPv0yZnnb4qb4GKpP7WbZbKNKEIBqVxBT UTnsQdMjDjsLOc7UOoB7DhkHefTDPGGn1mIa2Ydxwn/0EXHY3+mVDJU0fW8EkaFOSa7j PjBwttygzDECZmFPXeWxVnWrqiQ02Q/Bb4hY4j17buqVJFnsaKZ7uJuC+KO4jDyAhG/p PUIhZxwTUlGXp65U6Y9yjQiKe5JrrcqwXT34FHlKOIQEm7H64DMfbWfH2wVtp8/BR8Dd 9+bm6K5kABRhYv4zcDq7A1uCIoPyzuvwathd6eqMOYEyVPZrLNkOjPN/7sb5CuQfrlhK Rmmg== X-Gm-Message-State: AOAM5315UJME9GktSHm4EFDSxulaEwwwvtRYGxHLVh9i41H5aZdx1vrx wy7kgiFE2gRE51r7o9OyS9sy8ZhOiAQ= X-Google-Smtp-Source: ABdhPJwb3Dp2RzavMRvPlvkKHLdw/uhjqDmLZh6FKZfXDyJZNtO9xbX6mhYd5Pk7iJMxh+lh+RTnSA== X-Received: by 2002:a5d:6a45:: with SMTP id t5mr9843331wrw.58.1599965914134; Sat, 12 Sep 2020 19:58:34 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f3sm11883355wmb.35.2020.09.12.19.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 19:58:33 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 04:57:53 +0200 Message-Id: <20200913025753.274772-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> References: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/16] avcodec/vble: Don't free buffer known to be NULL 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" Freeing a buffer allocated in the VBLE decoder's init function is the only thing the decoder's close function does and this implies that it is unnecessary to call it in case said allocation fails. Yet this is what has been done. Signed-off-by: Andreas Rheinhardt --- libavcodec/vble.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/vble.c b/libavcodec/vble.c index c48c13127a..2cddd550b1 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -197,7 +197,6 @@ static av_cold int vble_decode_init(AVCodecContext *avctx) if (!ctx->val) { av_log(avctx, AV_LOG_ERROR, "Could not allocate values buffer.\n"); - vble_decode_close(avctx); return AVERROR(ENOMEM); }