From patchwork Wed Apr 1 07:13:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18563 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 C54A844ADEC for ; Wed, 1 Apr 2020 10:39:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1D7368AB4A; Wed, 1 Apr 2020 10:39:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B427068AB4A for ; Wed, 1 Apr 2020 10:39:02 +0300 (EEST) Received: by mail-oi1-f195.google.com with SMTP id k18so21407884oib.3 for ; Wed, 01 Apr 2020 00:39:02 -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=qRP6B6tCAXy6nUVDP3Wt2M6HjgrhfCk9qYvphNZrq1o=; b=OKCn7IMEbDO3ZYJCD+M1lz0GgE0L7kc0nWeABcoz+3ynyxQOJagrHkYQ3+6UrJGpVj 1c2CNG2FT/ddIRV/1dQhSWXpvoc1EF6EBDDPkn1UHk+xgliV1WypPT0eonWWyWMmrQkV hn/d/JOJujRBDBChs3Y9gPRom/IwMnU+EzgGbRZsERDRa1wqZ+nqcexoJ9aePU0DbOAM nWA3oecZCQHpY71G4TnTaY0wBlSO5yiIB49q5xxdBwAAubLLVGxAyFBEZvXFqY1V0g1F E/T+99ZCgYi2RqAZ7sgwcfB+sO6615RWsLulksvGlXhYD6iYTAXKOzba6QkzfbCVSg1/ B3jw== 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=qRP6B6tCAXy6nUVDP3Wt2M6HjgrhfCk9qYvphNZrq1o=; b=qTXSjL3n6ixivLAPMy6pM5RrL9wgyBA92rFg252szpY93o/Fs3AwZP68+WrnYWpj9P +gOsZ0GS4BY18VCcstxnZmP9VtnV9y0rSNyK5SZ6I8n3mKmVvezOX4riRfhEoJZIS2u5 770irbt3wDAMnrxrMbrft3ix/wnCPMhypLUT5MBZhJvoZQwmRBdoyH52ENMQrFsrBNkA YrPfhZ9OOBRL7XHEK1nuSYqboMJOJCLqr4c+bemUQAHhfVeIFV8H9Al79eGpgmAsLcTs sNVnm3v8f/IG0RNs56436+Oy1mXPRCFvmt8KFZ7H/M/BivTT+WGdZcnOWTfKoXIjTL/T aCtQ== X-Gm-Message-State: AGi0Pua+WGv589XnuifO2eilVsBImrhyGR8MglH7rixfKLdDFGyM2xhJ WdqJzC6D3ecWQ5KYUsKpE1jV0I2C2RY= X-Google-Smtp-Source: APiQypLhaoPSraCr3xE4tCivo36nIwCxrZoaZwbNNgMkLxKFa+ZPCtWJAAPN/lVu2Nzh0Z5SaQQkDw== X-Received: by 2002:a17:90a:d3c7:: with SMTP id d7mr3032029pjw.169.1585725243465; Wed, 01 Apr 2020 00:14:03 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id g75sm855015pje.37.2020.04.01.00.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2020 00:14:02 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Apr 2020 12:43:46 +0530 Message-Id: <20200401071346.20416-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] libavcodec/jpeg2000dec.c: Fix cblk decode error check 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 bpno becoming negative is not an error. This check has been verified with openjpeg, where the loop ends safely when bpno becomes negative, instead of returning an error. This patch must resolve ticket #5630. --- libavcodec/jpeg2000dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 7103cd6ceb..c5711b60ec 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1562,8 +1562,7 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, while (passno--) { if (bpno < 0) { - av_log(s->avctx, AV_LOG_ERROR, "bpno became negative\n"); - return AVERROR_INVALIDDATA; + break; } switch(pass_t) { case 0: