From patchwork Sun Mar 5 23:36:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2478196pzb; Sun, 5 Mar 2023 15:37:18 -0800 (PST) X-Google-Smtp-Source: AK7set+qim7w9HHxh/npuLJCZsM7IBJW3YQWeWRHQBMhZiqxWOBeW1LlQvbFhrUE7FcyCSsGzrWf X-Received: by 2002:a17:907:20aa:b0:8b1:3a8f:a51 with SMTP id pw10-20020a17090720aa00b008b13a8f0a51mr8825464ejb.15.1678059438038; Sun, 05 Mar 2023 15:37:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678059438; cv=none; d=google.com; s=arc-20160816; b=TIwl+1wXLY1t135hynJXXGz28Rdy/EyJQgCm/O2VDr7awG4vgCntOXq7Z4D15lrvrV RkIuWxvPWsi/kEFkWYrSmTpcxlWiaI76Q/1LJ7/Qw5p9N5vWHnwJIYizfvlXxcK01biU G/7nuI+7+7Lvu4VigRCfWS5g/MnYnYMTQkyBIj4+dIb+2hrVRuwPSjKJLkE0HKIyxKA1 Uk3O+5I3WmaZONT5lSXwFPSKaBFqZsTx6/Z1nllFB/V1cKECOZQOlcMuhKugUyUbtzxa 02avXRV2xilTq+QWDO7uvalXSpK3MpriSusjoz7FlUXAnL2/9St93eT1xlGIxakief9N qHvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=1mz4hiYeQPH9QHR2hJcML5UQOnEkrmNPAjGH7ya86vA=; b=yZVKLJv7P3Fg+QSve8xRO+VX71fI/tToZCGm5xtLqGMBRyoabEPYog8NIzozjtBI6Z +nbgReu60pNUCZzNa0EQUn7KBSkQtY1d/Y8hkTyWou0A2u9H+7N3qNXBivDjoKlIxyD2 raSMj5trA9aIPhfjzhtsLGQFykISJNAvuffMHWk+qsNhxgqPNB4MP5RJvOD4zx2SW4N6 PfY1KzMlVTfxA0Ld1ir4CT1OWyLT5kyw+37+3GJMTBr8YC/BSJcgpNxR+7jWgUrUh24m lNvMX6Ygxgisald+LvaCuseOgCCbk52csJNUbWSTdelIZ/FvY+wwfTzX52MIsNYoFq+X G3cw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d21-20020a50fb15000000b004c215052ff3si8994404edq.41.2023.03.05.15.37.17; Sun, 05 Mar 2023 15:37:18 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81AEB68BB59; Mon, 6 Mar 2023 01:37:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70BAC68AC15 for ; Mon, 6 Mar 2023 01:36:57 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 81BD0100002 for ; Sun, 5 Mar 2023 23:36:56 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 6 Mar 2023 00:36:53 +0100 Message-Id: <20230305233654.13895-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230305233654.13895-1-michael@niedermayer.cc> References: <20230305233654.13895-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/escape124: Fix some return codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QXlj/ELXPZta Signed-off-by: Michael Niedermayer --- libavcodec/escape124.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index e9c6b2df1b..064a4e6bf5 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -89,11 +89,6 @@ static CodeBook unpack_codebook(GetBitContext* gb, unsigned depth, unsigned i, j; CodeBook cb = { 0 }; - if (size >= INT_MAX / 34 || get_bits_left(gb) < (int)size * 34) - return cb; - - if (size >= INT_MAX / sizeof(MacroBlock)) - return cb; cb.blocks = av_malloc(size ? size * sizeof(MacroBlock) : 1); if (!cb.blocks) return cb; @@ -225,7 +220,7 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame, // represent a lower bound of the space needed for skipped superblocks. Non // skipped SBs need more space. if (get_bits_left(&gb) < 64 + s->num_superblocks * 23LL / 4320) - return -1; + return AVERROR_INVALIDDATA; frame_flags = get_bits_long(&gb, 32); frame_size = get_bits_long(&gb, 32); @@ -276,9 +271,14 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame, } av_freep(&s->codebooks[i].blocks); + if (cb_size >= INT_MAX / 34 || get_bits_left(&gb) < (int)cb_size * 34) + return AVERROR_INVALIDDATA; + + if (cb_size >= INT_MAX / sizeof(MacroBlock)) + return AVERROR_INVALIDDATA; s->codebooks[i] = unpack_codebook(&gb, cb_depth, cb_size); if (!s->codebooks[i].blocks) - return -1; + return AVERROR(ENOMEM); } }