From patchwork Mon Jun 29 17:59:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20737 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2994959ybm; Mon, 29 Jun 2020 10:59:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaXcj0Zx8PBoM/UmmuUqQa9OaTaBJLPpjVav1F9ZvdDbDnVCmeMarrukC0ZsX4CsxvnPDI X-Received: by 2002:a5d:408c:: with SMTP id o12mr18073870wrp.412.1593453563316; Mon, 29 Jun 2020 10:59:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593453563; cv=none; d=google.com; s=arc-20160816; b=oGpLgsnrx8CmqAAIEwyTUoXQHtdDq2QpyLlnR+h3fdgum3WC3Ao/2OSNvRdzYcOg90 gx97twNzBJ4BckETiH7Pboq8ZiEAWU0VwRNGf3Pebe3B0feyuGK59qiirvDcHsf8Jgyo 9Pze6Uq7Vt712n1E2XR8Y+83CufhPGuQq6Z9W5YhcNkLMyudwcrAQYVnafWhRKR084Fg 8zBLljA9XK5QSlXhe7hfGT4+UDLSSpdt5RGcZVpE1aP5bDlZ4JR4/qG8Zm+JZ+8Vasxc lU6Agcf0ays+m9r9vLXZj37uhIljD4Z9nEsCq4FTpbvoLkNff6fEAoTyhoGyPoJatXJl hlug== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=PDejdewpLDBXats9kJfjElzURFfZb9wgoWJnLdZRYL8=; b=nOdIH+iaAcg+NMTQ0yV/GN5vvMrIJSxHBMqTAL7lSlDv75pxU7URzNlg6K6Yf838k3 5pz6wcp0HWW+lJU9T0f00Si5v3juMgvznNZ0/wbzO9MQAfNGBQONI7wI8zHfXDyg/TjN Dc8rF9nSNmZRsjKXhh1ZXFgRrCA4KwXgZXzQ38sU7a/WaXHEHT7E1PIVcY8H8yI2UGoD kafY5xdmfvM0ucvyWIj1DqUpXSG8jivuSEYfgIUcLo63mwO2VLWPknEwoGyuDkNLIyQ1 1NJ7yhNTsIXVFkTqdK6tslmydj1Tz/VWXAIc4mCw6KKGt2SlksntI2/3t03MkG1xaa02 lJWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fFutzuJh; 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 j12si482231wrn.261.2020.06.29.10.59.22; Mon, 29 Jun 2020 10:59:23 -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=20161025 header.b=fFutzuJh; 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 ED7CF6880B2; Mon, 29 Jun 2020 20:59:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB2CD688078 for ; Mon, 29 Jun 2020 20:59:14 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id q90so7571951pjh.3 for ; Mon, 29 Jun 2020 10:59:14 -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=YoDycpovMxTepXfRqCHSIxS2KapB73QwnYxLQANcpgk=; b=fFutzuJhhTSdIdUhpeZrIgcPjLqkwozBmfLp6UR11nMEtw4IbFHRwwSDCqPG59CpGT kuBWvCTonNpVtq1VQqkvbZhSkXDaLpxlfnEVaW3ASDHBRSC1pQr8mEn/antFlCcCFPyF 7ydsP3QciQ6lJc8DvYiegYQpodLUO19Z5EfD50b7w6BKNgz8iN62/FOXX0DJUhlHmDem BDAmqZLuwRIsiLByLEtXB7JeI9QgNf5FinqdAg78PkoXrmss89rzGTis8L4moRS8Diyt oJlsu82JOqOTb5Xc8jyNBkgoo3eS4XgvCjncrZqCd2rWAKlbnZS0Cu4VlVJPEJfMyOPv 9Ffw== 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=YoDycpovMxTepXfRqCHSIxS2KapB73QwnYxLQANcpgk=; b=Qwiu2RMg1q2hfikmAgeo3OdygH/f6le/GnhDgO2alohgvPpj1h9ABZsLQ0nGuNa+6d 5Qj6beqIWH3wBQquN5ET0tqB2sHAezJEctvzX65ZP/Hq5AbByP6sGbAb0+sjlHB0EfEj 7wQPW4Sx7pDaKQqbUzKxjph3QdhvIouh4eReIrvmYhXCUJynTYq7k+XFven8aahV6EXK aav2UfzS+lRySGM4WBy84++zP6n42dsi6yOrIwArx7Zm+9aGzN0zgLrOxqltxAuKWnit J0ZBKCHA1ozehhofCwD9ono0s8DqxiWHQ3FfAwXn9zyXzHdA0Hm1CxCHWTbnGszLrwiQ kn6A== X-Gm-Message-State: AOAM530iIWnAWL/0xT6BPGT29NoIHjQkiyLYObPHxqcIbS2DYHUUN/he /F2CmAgfXUm+fFUkKTpBDUOQmnYnaoUfCQ== X-Received: by 2002:a17:90a:e7c2:: with SMTP id kb2mr19706606pjb.69.1593453552723; Mon, 29 Jun 2020 10:59:12 -0700 (PDT) Received: from localhost.localdomain ([122.181.59.182]) by smtp.gmail.com with ESMTPSA id c207sm323766pfb.159.2020.06.29.10.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 10:59:12 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 23:29:06 +0530 Message-Id: <20200629175906.16370-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] libavcodec/jpeg2000.c: Precinct size check removed 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" X-TUID: a9kqhVlzU3Mc Content-Length: 4110 From: Gautam Ramakrishnan This patch removes a check which throws an error if the log2 precinct width/height is 0. The standard allows the first component to have 0 as the log2 width/height. However, to ensure proper intialization of coding style, an extra check has been added. --- libavcodec/jpeg2000.c | 3 --- libavcodec/jpeg2000.h | 1 + libavcodec/jpeg2000dec.c | 6 ++++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 73206d17f3..1aca31ffa4 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -509,9 +509,6 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, // update precincts size: 2^n value reslevel->log2_prec_width = codsty->log2_prec_widths[reslevelno]; reslevel->log2_prec_height = codsty->log2_prec_heights[reslevelno]; - if (!reslevel->log2_prec_width || !reslevel->log2_prec_height) { - return AVERROR_INVALIDDATA; - } /* Number of bands for each resolution level */ if (reslevelno == 0) diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 0f82716981..27df43786d 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -144,6 +144,7 @@ typedef struct Jpeg2000CodingStyle { uint8_t prog_order; // progression order uint8_t log2_prec_widths[JPEG2000_MAX_RESLEVELS]; // precincts size according resolution levels uint8_t log2_prec_heights[JPEG2000_MAX_RESLEVELS]; // TODO: initialize prec_size array with 0? + uint8_t init; } Jpeg2000CodingStyle; typedef struct Jpeg2000QuantStyle { diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 546a646668..3f4a9ef96c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -567,7 +567,7 @@ static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, if ((ret = get_cox(s, &tmp)) < 0) return ret; - + tmp.init = 1; for (compno = 0; compno < s->ncomponents; compno++) if (!(properties[compno] & HAD_COC)) memcpy(c + compno, &tmp, sizeof(tmp)); @@ -605,6 +605,7 @@ static int get_coc(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, return ret; properties[compno] |= HAD_COC; + c->init = 1; return 0; } @@ -991,7 +992,8 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) if (!comp->roi_shift) comp->roi_shift = s->roi_shift[compno]; - + if (!codsty->init) + return AVERROR_INVALIDDATA; if (ret = ff_jpeg2000_init_component(comp, codsty, qntsty, s->cbps[compno], s->cdx[compno], s->cdy[compno], s->avctx))