From patchwork Fri Jul 31 11:22:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21409 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 D9DE244998B for ; Fri, 31 Jul 2020 14:23:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C903568B890; Fri, 31 Jul 2020 14:23:42 +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 5938468B737 for ; Fri, 31 Jul 2020 14:23:34 +0300 (EEST) Received: by mail-ed1-f68.google.com with SMTP id df16so5777995edb.9 for ; Fri, 31 Jul 2020 04:23: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=UgfSZKwI/LtvP9ohsRq2NZXpGlmHK1zXQ0YwhTCD7u4=; b=SMtDGUq1J8u4QL1RI/WbwiTX3RWHrTnF5fvQTl9hYnvTz47jyyqcERcmuVK0yGSayV 9Uo5Oj0RcUtCderd0uVF8ci5AWtTrAejiL4Ib0z5nzmFbPwDrTZXKO/E2XjpPoe2NF26 f+EjKV3FZEGruRI57I631e4SHFjlkV6yl4yrWpm3Yrjby80tMlzai858W2WWdZnu3Cme 7vPSPwa/6PCsHLhrPuqeV4rsss7yN6tJrPQT6O9D2dFJWNkD3PoDcpGeU8iSv/icEZN1 kWCHqUxOPBKlmB0THVTJV0AbDS1ssx3quMRCjLUa+MNf58GF69WsMQz4j1aNWo+QyqKy vIeA== 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=UgfSZKwI/LtvP9ohsRq2NZXpGlmHK1zXQ0YwhTCD7u4=; b=mfBsNPEHGm7A6MYCkMYzEzFm5JvJSvdOOjjDlSpOeQFcHT9QKhpJ6jtT0/mIX3+XgO al6EfQqh6AK+oalhqqEpXOUKr3Q8aanR8AUJVe17rcF9ofaaI8KUg+0uLdXuwf8gSTmT LG/of3AnP3XirPKbFex5G0lXacEzWDU+VBiVEy2d4WoR2DIbtKgnuDkfBQs1Ybk2Ze3d VN+icRhyrg+U0/qVdvyDacLpEMR0JuBHAEhMZljTX+OCnx4zgcIgasmyHWb3QNl7hdku UHMDzo5lYqo7uwt0ukfWDv8OEvxgOF6SrteSNbri34hLFh93Z4hhDvXZzzfZOIKtcno5 yxzA== X-Gm-Message-State: AOAM531EXAAH0yDARXkTeivrStKkuWyzQS7KMewpuKocPG7Df4G/Nkty 4PZH7KvNQTwHFLnXzWjbJVKfW3YX X-Google-Smtp-Source: ABdhPJx8weTMy3b3304QFO+VeU6vu5HtkL48sT23atMD89uykxzP5NOU755pIoKOwrMfc+ugJCEcww== X-Received: by 2002:aa7:dc4f:: with SMTP id g15mr3385034edu.335.1596194612656; Fri, 31 Jul 2020 04:23:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 04:23:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Jul 2020 13:22:41 +0200 Message-Id: <20200731112241.8948-8-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 8/8] avcodec/smacker: Forward error codes 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 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 07fa8887d8..9ba70af6f7 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -653,18 +653,15 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, goto error; } skip_bits1(&gb); - if (smacker_decode_tree(&gb, &h[i], 0, 0) < 0) { - ret = AVERROR_INVALIDDATA; + if ((ret = smacker_decode_tree(&gb, &h[i], 0, 0)) < 0) goto error; - } skip_bits1(&gb); if(h[i].current > 1) { - res = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length, + ret = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length, h[i].lengths, sizeof(int), sizeof(int), h[i].bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE); - if(res < 0) { + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Cannot build VLC table\n"); - ret = AVERROR_INVALIDDATA; goto error; } }