From patchwork Tue Jul 14 16:43:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21010 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 76A9D44AD8E for ; Tue, 14 Jul 2020 19:43:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 520B668B107; Tue, 14 Jul 2020 19:43:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C83A96881FC for ; Tue, 14 Jul 2020 19:43:36 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id 72so7265743ple.0 for ; Tue, 14 Jul 2020 09:43:36 -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=aM1OtkbcX9mhoiDSHtItLlXx9YSOQlDmFCDfqpKd3hLnDLVchC5NHwFgQXrHK9e5s6 5Em3iDasqsxn5U0GK/VZI+FaJlPWLgq/3ntOWlfnnkv9zhon0LYcgwghhnHO5NMyTza7 PDxeQ1bXm3HK4Rc+7ph1pxnf4eXDfhZgGfWvHPB1tQzyOgxzHBWr5ixYsT5AWAGUPZ+M DJJl0mS28SSafJXa4kehSJ+i3smyf7StsXqiK9CC0u4SyFcwarnIuZh0S9HhMgdnWafZ SaehLuINu2yU6oI7s9+OwGu9K1S11rPOIWIDb5LMWWT40847Nt+Ql94Zc6Mw/bRzWHxz RrtA== 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=Oftwo5oKBMNq3PuNmdf+y726XNRzhyGRs2rvPjzJ5reXMQfGmjTllElDgiGdNgMqLP 6zg3ym1P92sntPBrqdrAxXGc5E5xXUP92K9vZbFeBI4FjLZGGgVLRq/SUxuQLxJ80Udd mK3scagUvyza2c8OvVTMhXc+CTkiH9J8ZtI1Axxdlx1E49KYAeFHkJcf6cSKIvbt1PFd DI9BK9Srzw68/xMBChxN8swafwyba9jLi1n7GYqUjF3H22nC155bzwfmqzY2cAwOzeYU RAlNY+zDzAHBjN0cK9emcOciL1N9fxYY8o8rMg9AInapfB7w2o1BK8Rh/+mXfwqLtO3C ocCw== X-Gm-Message-State: AOAM531o7nFIwS5U4r7qOS9Q2MVHKEoM87OQ+MC0qfMt0OO7aCQwmHsl vbG0qw0owdX7d4Ko87j4QwRhMXRf9NP4Xg== X-Google-Smtp-Source: ABdhPJzTd+gbJhjGGCpDU88tTmpiJlRcr705beY5yM2SP9xr/kKUmFLK9L8+tdeMI/i0140JipJV9A== X-Received: by 2002:a17:90b:3748:: with SMTP id ne8mr5095771pjb.7.1594745013949; Tue, 14 Jul 2020 09:43:33 -0700 (PDT) Received: from localhost.localdomain ([122.172.60.196]) by smtp.gmail.com with ESMTPSA id c1sm3295983pje.9.2020.07.14.09.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 09:43:33 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jul 2020 22:13:13 +0530 Message-Id: <20200714164316.32120-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 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;