From patchwork Mon Jul 13 17:19:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20994 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 2A2854493BF for ; Mon, 13 Jul 2020 20:27:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 021AD68A0F8; Mon, 13 Jul 2020 20:27:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EA68688105 for ; Mon, 13 Jul 2020 20:27:20 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id d4so6323823pgk.4 for ; Mon, 13 Jul 2020 10:27:20 -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; bh=aFvpUiV97yYouAM7ZhPnFKFKLodt1GWGRdO2a5RVASc=; b=Rb/5BkRRVgfH3VaN6AztFL6QIz6Bsq//87pOh2RpKTqjGpeMe7+ASjc5qOc0lMHVQ4 O0Wd+0Q5U4tSjLc6PY3TrWI9P3C2KHwJj1bZ6NK4+Uudsy36Mo59mC0tX8XlqC8g2VgY 5tG6DDgEnTtA3gBPcoWkAnhXzEv86xgoiIoLbzA+Ohr066EPGFhI6d9yCSjdPXn1wOLc M+42Q8lZgpy1ptqgteMhGiReVTJwHlyFxdbo5B0jNrm64G5xbIGbpes/J/O3JtzKVUmz GZ1Hha3ZyBqleuYjhBHsmpL7Iio3LB0SqP6EKAV/XM89smOQyJTCPLXzIMywx/tFEksu vVkg== 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; bh=aFvpUiV97yYouAM7ZhPnFKFKLodt1GWGRdO2a5RVASc=; b=C9RVGGUjjyYYwnRuGfrLZA35F4MiPAslWo8wxb5VBwYmXDUCQabZ6k112Fnk4pCl1l oTYmiw1bezWK97Ww/oqcBaooBUZymWV6UvnlnWEo2Z+9F9aVYrAbV9GCztGvoxyEp2cb JPnFK+LUveuQmTqow3SvOwMbfxyAXZNF8HOzUSrA9xY4mN4R1iBVZ+QZv6UoeBIrfUE7 TZpxG/794BPbE87AiGM+l2Qq61UUhPoqX2pOJsVeFksjGMVRONQQ11o4SmtJCEJ8UMUY WCOLSFzmZ2EoCKd3NB6PAdmaC0tPcFJy0gy5BeVJgGh5Pwms6O5CTwCJjC6K86q6rjCt hEmA== X-Gm-Message-State: AOAM533eVcskkvpI7mkoOI6hCM62Kc8eGVLr9P6ojJVeS16kkfwK+Hx/ S2FWisxVu7kyvoZ75dx+uuY0AlGCodltKw== X-Google-Smtp-Source: ABdhPJxJyiSvhLH7d8D5ZU/Zm1DtlYxUcN9ZEx/n0z2h18YORsNuFH03l5nKeasCtqWfthyR9aZ7aw== X-Received: by 2002:a63:457:: with SMTP id 84mr170846pge.219.1594660809356; Mon, 13 Jul 2020 10:20:09 -0700 (PDT) Received: from localhost.localdomain ([122.172.60.196]) by smtp.gmail.com with ESMTPSA id 17sm168440pjl.30.2020.07.13.10.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:20:08 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jul 2020 22:49:59 +0530 Message-Id: <20200713172002.14158-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] libavcodec/jpeg2000dec : Prevent overriding SOP marker bit 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan Currently, the COC marker overrides the SOP marker bit. However, only the COD marker may set this value. This patch fixes this bug. --- libavcodec/jpeg2000dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 18a933077e..48ca1c37a5 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -588,7 +588,7 @@ static int get_coc(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, uint8_t *properties) { int compno, ret; - uint8_t has_eph; + uint8_t has_eph, has_sop; if (bytestream2_get_bytes_left(&s->g) < 2) { av_log(s->avctx, AV_LOG_ERROR, "Insufficient space for COC\n"); @@ -606,8 +606,10 @@ static int get_coc(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, c += compno; has_eph = c->csty & JPEG2000_CSTY_EPH; + has_sop = c->csty & JPEG2000_CSTY_SOP; c->csty = bytestream2_get_byteu(&s->g); c->csty |= has_eph; //do not override eph present bits from COD + c->csty |= has_sop; //do not override sop present bits from COD if ((ret = get_cox(s, c)) < 0) return ret;