From patchwork Sat Aug 1 13:46:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21431 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 A700E44AA8D for ; Sat, 1 Aug 2020 16:49:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 974CE68BA83; Sat, 1 Aug 2020 16:49:41 +0300 (EEST) 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 B1F3E68BA72 for ; Sat, 1 Aug 2020 16:49:34 +0300 (EEST) Received: by mail-ed1-f68.google.com with SMTP id i26so20896221edv.4 for ; Sat, 01 Aug 2020 06:49:34 -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=8g3KqRB/s03tXhH4bNprT5Kd4dqWXPAK4DT4E9DU7uA=; b=C2DiMyo3nUgKQRSKiaP0soeSVM9g8l7xohKUTNV7PimYqZiseef4YhNLrlB6YIIkYg OlK7vN/EbYzPV6ILLa6cZaGfEi7tAjW6iHQr4CuBTzbv7AzFBiPXlpQJCGSnn8wIQdx2 kKRNM3y2SosQJQh+UEoT1/cjJ/lFe1QDVy/B3UC+fhmrBMDh0edRQuHi8U6aVxQDGDkc OfeU2jXOBC+ls5U8pDfCmuVXByoMQdYjmy7+7tQRh8HNhakZR2A3GP8u/MLTdcpjehNv AyZnWX6uuLaOD5Up1mVj9Z3RnCwHm4/CGOIq0z9fruSWceIbrVCZrY14gzZJiu/bKBuz EcEQ== 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=8g3KqRB/s03tXhH4bNprT5Kd4dqWXPAK4DT4E9DU7uA=; b=nweQKtDtsJ1DrZRQHfeOtUB8st3Ygs2cxfn4b9aJdBv2h3pKke36WbxllajiuZSeN3 JlVyK70tSqWkGB+3hPHPbBaM2ooTWQg3NQQPhA/HzS4C/bKTHoOTsHQ7+pV1Ljld/rJl eD4Ja/IbUfD38Y1n63DwcMHTjsV6jctXpg6jr3V/xzEqJABlF2m6gkPGn1kvb9G/Bzfj 7gve4rgdhNHokCL+8Zug4oOlzbJ8Al9zfCg+21iD8hUHTrHv1X3d2si4DZGx2SnxVuXa Gs/xSLEBybRii8jE18urEMSnjtdJMyLC48s/j85zIBvFpPj3NcTEoqIb8Xrd3xRbBW/O MS9g== X-Gm-Message-State: AOAM532Gbog6zbfP/mouGliRL6NOsy3W/VARsATnECwkF3cQMMG/HlpC 5aPxiw3ZDfVd/8so1nH+9JfG5Zu3 X-Google-Smtp-Source: ABdhPJwNeNctf4QjgXa/iYXamPEM6G0tcxtc8kDYPTCCGc43gtfCZKagsXCtX1f7YhL/Yz+pCkdrYA== X-Received: by 2002:a05:6402:16c2:: with SMTP id r2mr8103605edx.127.1596289773907; Sat, 01 Aug 2020 06:49:33 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id b24sm12178501edn.33.2020.08.01.06.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 06:49:33 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Aug 2020 15:46:57 +0200 Message-Id: <20200801134704.3647-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> References: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/21] avcodec/smacker: Remove redundant checks for NULL before freeing 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/smacker.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 5e1b8c59ff..5e88e18aec 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -254,8 +254,7 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int err = 0; error: for (int i = 0; i < 2; i++) { - if (vlc[i].table) - ff_free_vlc(&vlc[i]); + ff_free_vlc(&vlc[i]); av_free(h[i].bits); av_free(h[i].lengths); av_free(h[i].values); @@ -732,8 +731,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, error: for(i = 0; i < 4; i++) { - if(vlc[i].table) - ff_free_vlc(&vlc[i]); + ff_free_vlc(&vlc[i]); av_free(h[i].bits); av_free(h[i].lengths); av_free(h[i].values);