From patchwork Mon Jun 5 18:04:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Etemesi X-Patchwork-Id: 41980 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp3298821pzb; Mon, 5 Jun 2023 11:04:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7m6vswu2WKgbCuqx5EXrz5r1lTb0RSnfRaOonDinY4p8RkXLgpiJqcb8q9ysKzbIyk8LjJ X-Received: by 2002:a17:906:5d09:b0:977:abac:9635 with SMTP id g9-20020a1709065d0900b00977abac9635mr7177580ejt.20.1685988285548; Mon, 05 Jun 2023 11:04:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685988285; cv=none; d=google.com; s=arc-20160816; b=GQLYYJUb0Mgi7l6AVtaW0drUnSNF9t8ar1yoGNF3KyTEVgXUMAM8h/u3SKChkSip+v Uzv4dN97o6hDKtrKIHa5ThBYi7TyACPlvxxg05ptBd6wxQLgBQF03C8oncYaWZivP9Rg lslENjifZychgnptB8ATQhtye84Un5+vDGGBsYt017kFvsCqkihCVtCJK0MwNRECJ2uy JEW5TNOKSdeQidww2Gs0ANkfJOMwM8KjsuFwKMjJGcDLxauj4ZeGKh+vQCYQpoq/TW5p 0tebw19pDkVc/dFVDLzNtlPdQqHNsZXZ3Dg8DUoa2ccCkaAgDjVq8Avlfm72H/o6i/yl nl8Q== 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=mTJxw24Ewd6NLsvmjR3khgcH3ApA9w/63G48HBcAuAE=; b=vnBFytcKu28TJQFbdUzSqgo+kkyD1PokprTflMiGvKYAWmYHIdCYYdr+T+juyhHIxc BXexuP6l7Ma/jGoy/2U0eO5UCW7Fn9YLABcpEwQVRq55ISWXuQKraFNpiYLosUk1bZp6 15LDsQubkA2AHWrYXFKs3DEcK5aJEHVAN0TDVo8eOZ3cfztyLTaqsMWH+neNa5Q/aoSn uw1IQVP0J1c5dvuMit43KboBWFp9EXRU4V0oGCzWWh97LnWQzdW1bd+AZZ/mgm3yNIaR SaUYRGaChN70K5iON2WNmKRHgedg1ButydPm5zUce2wFi9PqQNvsGdVylCk0cVWetvl9 zhIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=If380EJw; 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 v4-20020a170906380400b0096f739c478asi5106472ejc.642.2023.06.05.11.04.44; Mon, 05 Jun 2023 11:04:45 -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=If380EJw; 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 AF33268C29E; Mon, 5 Jun 2023 21:04:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f171.google.com (mail-vk1-f171.google.com [209.85.221.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B645068C2B1 for ; Mon, 5 Jun 2023 21:04:34 +0300 (EEST) Received: by mail-vk1-f171.google.com with SMTP id 71dfb90a1353d-465db156268so265084e0c.3 for ; Mon, 05 Jun 2023 11:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685988273; x=1688580273; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gZSRZX/ZYoC+FBvj1dJoPqtXuSm+lnjFsEH48dN1qtE=; b=If380EJwrK/gHwEZtVGQ8cf3jxgode9XVpVDrlCOPQGiape2tt3yFUfFPCyhAWftyr NqEj1812/9tu7DB8ohAmxPx2jTmdR/eTUHIn6/3umD0WX7NpRO3nX7VOEAfuYp+q9QWq ByaVybuA1XAZhszTK7uVBveAUmsXYDUbXZ1ZHzidiA4txfuj/eBQnZTniBo48qPCkltL bETKus1hRMFLcgXWYwTbTowEC823wyTahdXc5wYkwN3pOXngqAIp+AARpvvwLQklywlw YNNudky5TBhtg7oIwA6z+LjTHLsiVrmzj1HwOFCg+jnpR90Y/78VOD+rznu5PgaheRTu cs0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685988273; x=1688580273; 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=gZSRZX/ZYoC+FBvj1dJoPqtXuSm+lnjFsEH48dN1qtE=; b=XIm/hAHaB57mn6Zl3qgE2B9TA/tJ65+fkT+Ny60KZfiqmMGpjcxeiY+AB8hgzSJXW2 9PmEDRhlkvg+Z/pq1dSc16bjhA2g2wrHWYIAi8AXhO90VO1q3/PN5qP7UoDnF0tVnbpB JaqdNlF0odhwu8gX1qzJHv1kLf2wydDhcFWPonvRC2wDujJON6EaDN0Vbaosp9gXIQ2i PsjIhq9buRss6MhnmzKCNXsa2uPPKQr/5bQQE0mS5uOJ4tUen7kgrGMshKclEsR4dqDy S0nwcKv12a7ogb2DOudMIBc6iLtCUpMDoGQpcZTaBOTWzBdW0h0Ly1vr4r0zzkRuRps0 6TtA== X-Gm-Message-State: AC+VfDxBIq38kHURJNmIDpZc6Jh/7AExEg9dVKkDum7xSUrz4eBmQPLy nYC1QFNb3bXw5o5yYvMVWg63GfFJuSM9HA== X-Received: by 2002:a67:fa0a:0:b0:426:20a8:a5b0 with SMTP id i10-20020a67fa0a000000b0042620a8a5b0mr565681vsq.13.1685988272839; Mon, 05 Jun 2023 11:04:32 -0700 (PDT) Received: from localhost.localdomain ([41.80.118.92]) by smtp.gmail.com with ESMTPSA id t23-20020ab04ad7000000b00786fd01f05bsm1506421uae.24.2023.06.05.11.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 11:04:32 -0700 (PDT) From: etemesicaleb@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jun 2023 21:04:04 +0300 Message-Id: <20230605180404.130456-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: +pUxj5FwKsFv From: caleb --- libavcodec/jpeg2000htdec.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c index 51cd96e0f1..474d671ee0 100644 --- a/libavcodec/jpeg2000htdec.c +++ b/libavcodec/jpeg2000htdec.c @@ -1101,8 +1101,8 @@ 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(const Jpeg2000DecoderContext *s,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) { StateVars mag_ref = { 0 }; @@ -1111,6 +1111,10 @@ jpeg2000_decode_magref_segment(Jpeg2000Cblk *cblk, uint16_t width, uint16_t bloc uint16_t i_start = 0; int32_t *sp; + if (magref_length < 2){ + av_log(s->avctx,AV_LOG_ERROR,"Invalid magnitude refinement length\n"); + return AVERROR_INVALIDDATA; + } jpeg2000_init_mag_ref(&mag_ref, magref_length); for (int n1 = 0; n1 < num_v_stripe; n1++) { @@ -1261,7 +1265,7 @@ ff_jpeg2000_decode_htj2k(const Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c pLSB - 1, sample_buf, block_states); if (cblk->npasses > 2) - if ((ret = jpeg2000_decode_magref_segment(cblk, width, height, Dref, Lref, + if ((ret = jpeg2000_decode_magref_segment(s,cblk, width, height, Dref, Lref, pLSB - 1, sample_buf, block_states)) < 0) goto free;