From patchwork Wed Jun 7 07:34:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Etemesi X-Patchwork-Id: 41988 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp189982pzb; Wed, 7 Jun 2023 00:35:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5nWioz/4IBSA4a36nNDixR8OXnbGsO8m7VOTizLfkJ5mBZLpPU+dyuKzk8yA7UufMEtJk/ X-Received: by 2002:a17:907:7b88:b0:973:8edc:5a57 with SMTP id ne8-20020a1709077b8800b009738edc5a57mr12574735ejc.4.1686123330725; Wed, 07 Jun 2023 00:35:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686123330; cv=none; d=google.com; s=arc-20160816; b=uYGBzgIlxLYMxEkh44xC/eFhDM1nBlN679CQbsteN+hk3zHZ980XyMHvPilAOGzDVu KIvIU1UxO7ZN5LKyMTGeOoA0XrB5OB92EOUysOtuznmYiwgt53FhmsvEi2AwSL13kPR5 RCkQykFQT962IyjCzzUgLTCbWsxL7nWzNayzG5fo0UhPg7y1QNuZ9CpnKZMoCIpCjo7g 9PAVZWLQBLhewc8LSt6UDOGeXTe0MT4qffGhzSUcPgO4FfhIw08oKB8fWXAK64DDJflr Z5wXETpc6po4BROIS9jk0XF9b52bETz/2oipAngG1JDVkE8ODokX5EmgZ58prIV/jBFF Y+2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=WHlXrnYW+rXsbtgTWwjnLv0VkLDGGS5u1OZosr40sf8=; b=nE9nyeByL5LCe+eL6zrmXgdc32BstRCRPmY/GmcCHR1Te6qgBIULkgAMSs6epA8Euu Y5rGmx8VgBcAJjTueDMdVb/H63Tj0NvMYTk9iSAEQmQvDZe6Kx9NUPp2yX/r5AKYId/A HFGtWt4eQV/eIMZm8FMY2VsGZ4HZUha2krZz3Ef1KozJmUqkSUXfjyB0Arhcc0FsMgmN 3QkErMdNGcMKAMXuoXCDPmAlmxbuquWuJ6r6BK4aw9XbpCiZh1O7/YyXJOBAmHzB3Jh+ x5eIMgUEhGI0oENShReNvB10q9PZI8fAz0dtXsHjwykdU4KhGbzfhFdqU4mxTFhfYao6 7poA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Eq2kBF8f; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z25-20020a170906715900b0096630a5c7f5si7381909ejj.207.2023.06.07.00.35.29; Wed, 07 Jun 2023 00:35:30 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Eq2kBF8f; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A794168C333; Wed, 7 Jun 2023 10:35:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 627A868BA7B for ; Wed, 7 Jun 2023 10:35:20 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-3f6ffc2b314so1998625e9.0 for ; Wed, 07 Jun 2023 00:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686123319; x=1688715319; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=17I6YK7tuYcXbaAE+gu0VF0Ex0yBG+IvE4fFecpaAXM=; b=Eq2kBF8fF5oi9wpxMLFnbp4st8HJGABxYRnkBJz8OivWKygo62VgDlzIVGc9yxmArm h+SF1ooOz0MNcuCt8wR/BqdXUNpUIfFvII7ZK369pQ7Akoib3Rmb26mrvXzqQyyZQNbr T1hTs1QFAFKR139QqZTFC+FqiDqfJ3kj4oCXBMBC5SowCL50sJtAwumFtvDOWB4NWt2Y C8FcVC836lIbNOuEpojUoCcV2Vmjxev3nzf4YU2UnGdH7MRXn+3qLQ9fJKU5cQ/bJM4z moqMu2uau7EyXVRuC4Wm8QOpvrwhdUflglkDm9PjoQshfJcY1GYhxPJMxJFwah78cNKJ RbfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686123319; x=1688715319; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=17I6YK7tuYcXbaAE+gu0VF0Ex0yBG+IvE4fFecpaAXM=; b=gkzWgP4LzK47+SX7Qun8HwUv6fuDudhwawdjxcsdRNoUpFtdCcjCrZ1nCqCkWChnoM X93NPP/uvIzfPxErj11hpJzbkhZ+uQjSF/93myt9UBLOpjyU1znyGeK9o8sw8nItQkWa 7Q6v7HC4/f36sTKVLQKQjGm3+unvjWcaF6udyYVVWFzBktgwIdPGnom8CBZjSWW+HT5O 9V/dWO8c7SWbNTRvral8rfzRV67nLUxKf9VyoLBxJEGXKZLsp7jyJcaa4Qy4MVH82F6p VRdfL8IZd4NSQDB77hDtBt+2cqgG1IuZCkrICVCWOUE8So1ztR8V7A4ie7b7azNFeIBD wo5g== X-Gm-Message-State: AC+VfDwkYzITUTlmj1RJZFVyKzBC85q7JuxwIAh+HBCVNnOdhaIutf5d +ML5qvALdMBoTmSFyaMsBcRuBLvixwF3XQ== X-Received: by 2002:a7b:c7d7:0:b0:3f7:c92:57a0 with SMTP id z23-20020a7bc7d7000000b003f70c9257a0mr3642315wmk.14.1686123318950; Wed, 07 Jun 2023 00:35:18 -0700 (PDT) Received: from caleb.strathmore.local ([156.0.233.55]) by smtp.gmail.com with ESMTPSA id f17-20020a7bc8d1000000b003f7e6d7f71esm1136010wml.36.2023.06.07.00.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 00:35:18 -0700 (PDT) From: etemesicaleb@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jun 2023 10:34:34 +0300 Message-Id: <20230607073434.69790-1-etemesicaleb@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/jpeg2000htdec: Check for invalid magref length. 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 Cc: caleb , pal@sandflow.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +26H3sh3F9we From: caleb --- libavcodec/jpeg2000htdec.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c index 51cd96e0f1..4c4e54710d 100644 --- a/libavcodec/jpeg2000htdec.c +++ b/libavcodec/jpeg2000htdec.c @@ -1101,8 +1101,9 @@ static void jpeg2000_decode_sigprop_segment(Jpeg2000Cblk *cblk, uint16_t width, * See procedure decodeSigPropMag at Rec. ITU-T T.814, 7.5. */ static int -jpeg2000_decode_magref_segment(Jpeg2000Cblk *cblk, uint16_t width, uint16_t block_height, uint8_t *magref_segment, - uint32_t magref_length, uint8_t pLSB, int32_t *sample_buf, uint8_t *block_states) +jpeg2000_decode_magref_segment( uint16_t width, uint16_t block_height, + uint8_t *magref_segment,uint32_t magref_length, + uint8_t pLSB, int32_t *sample_buf, uint8_t *block_states) { StateVars mag_ref = { 0 }; @@ -1260,10 +1261,17 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c jpeg2000_decode_sigprop_segment(cblk, width, height, Dref, Lref, pLSB - 1, sample_buf, block_states); - if (cblk->npasses > 2) - if ((ret = jpeg2000_decode_magref_segment(cblk, width, height, Dref, Lref, - pLSB - 1, sample_buf, block_states)) < 0) + if (cblk->npasses > 2) { + + if (Lref < 2){ + av_log(s->avctx,AV_LOG_ERROR,"Invalid magnitude refinement length\n"); + ret = AVERROR_INVALIDDATA; + goto free; + } + if ((ret = jpeg2000_decode_magref_segment(width, height, Dref, Lref, + pLSB - 1, sample_buf, block_states)) < 0) goto free; + } pLSB = 31 - M_b;