From patchwork Fri Jul 31 11:22:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21407 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 431C544998B for ; Fri, 31 Jul 2020 14:23:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F5B468B8A2; Fri, 31 Jul 2020 14:23:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D24BC68B85E for ; Fri, 31 Jul 2020 14:23:31 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id kq25so18114850ejb.3 for ; Fri, 31 Jul 2020 04:23:31 -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=DHOwTqCDJ1/TKKER/rGMBF8mJoQIXaRtlJeR8gRqN1I=; b=WvnC2ckVNrKutYfb2cc5WwICdfTR5fJxuxJpP18kZ4Tp3gXCYzmp2vvOfuJj5NpRXZ u7I/QI3lXKRTuCKv/rcflHsLfP5b0Z3jlgYBZFILox6pZKKrOF3dqVkQdS205LGqbxaR PRdbJUX4ODWXy7pXrg4VaQSyIpuwyIex1+sDXGInVQEKp21Hcey7S7Qd9NRZ+llZ0xfs 1UzUb+O2J2MHs5tl1bhXyZ7cTeu0pJeerVdYqJudCrFYaZmb5gjAduhFPoeAMKHq9j/y kd499P8U1fqqfaPrkZd6kkHcLiOjRbM4OY8wrxvHhRSjNJ4yfDHy7FSXs+kZYOvHVoDT VrnQ== 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=DHOwTqCDJ1/TKKER/rGMBF8mJoQIXaRtlJeR8gRqN1I=; b=qYInG9VXAxyksJBQF+LMEu112+PvS+m0mIV7PzC1fuyzUQjcDO5zUawFf5YPDG6rqL SXIqXgWwv+KNMGSshIhRs0Emgy8r9Q0FYg+pmDI0oBcYnE4QVapuYoErGsfJb9jFMIuU gYcG+1pdftCxP1JwNsVfVE8Pw139UkPAoPNMxib3op4XvGPesmcfh8eEp5nuucOumnGR lNF/2BT9QjJTxT3DuhGvkpwCCsD/zsFEQMp/dDxzQj/Z81tJR2mqIaSAmn+smNwXb0Se 2k68JOKYiiHk5hNTVGKmSU4YGdpNsxKLkPUrsX/DDTyDTxlxhuB8SU0zRW79USLXkrA2 i7yw== X-Gm-Message-State: AOAM532BPJLdbxlWfY6XNJ7EMiKH6c+KPEW58n83QkjAptZTdNI0GZhm OL+1qGddvzVuO1nHTmL/BnVZN8h9 X-Google-Smtp-Source: ABdhPJwQnkLAtiOtEg5uJaNXm8kZwOrRlzNv1vyFD15MDuGWmKHb6td5rv7FUSZBbc/t/vMXGPMUGw== X-Received: by 2002:a17:906:c406:: with SMTP id u6mr3696487ejz.47.1596194610916; Fri, 31 Jul 2020 04:23:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id v22sm9284279edq.35.2020.07.31.04.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 04:23:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Jul 2020 13:22:39 +0200 Message-Id: <20200731112241.8948-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 6/8] avcodec/smacker: Directly goto error in case of error 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 8a4d88cfed..4b1f0f1b7c 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -251,17 +251,18 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int err = AVERROR(ENOMEM); goto error; } + *recodes = huff.values; res = smacker_decode_bigtree(gb, &huff, &ctx, 0); - if (res < 0) + if (res < 0) { err = res; + goto error; + } skip_bits1(gb); if(ctx.last[0] == -1) ctx.last[0] = huff.current++; if(ctx.last[1] == -1) ctx.last[1] = huff.current++; if(ctx.last[2] == -1) ctx.last[2] = huff.current++; - *recodes = huff.values; - error: for (int i = 0; i < 2; i++) { if (vlc[i].table)