From patchwork Sat Mar 28 12:28:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18455 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 C37BA44B602 for ; Sat, 28 Mar 2020 14:28:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADAA068B582; Sat, 28 Mar 2020 14:28:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A568D68B087 for ; Sat, 28 Mar 2020 14:28:21 +0200 (EET) Received: by mail-pf1-f174.google.com with SMTP id r14so3450507pfl.12 for ; Sat, 28 Mar 2020 05:28:21 -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:in-reply-to:references; bh=lysenVw0FcLkOsE9dNptZVbpRlL8/wbW7eflKfOEXB8=; b=rn+4Qe/VdxJmDTRwFYrRXXxR9J72dkfZxg4yhd947YvBKmrecUMxRwHDYZxyLVavni wwMKHHA950B9Ly7M5crALbcH7/RTKzdDlTUIIuWcjZ9eXAzybUpzqhZhiYxJAkznHAy6 UifIXC6h6afdwTTSmiwwK6710lA8uY1KdHGKaHgZUmhAv6Abn70tVGk9g36/0JDUVtOR i8+RdtfROIpgNP2mh8reQwIPV6gEksggMcBeHytWGmaLSEdjLrfFaZ2G88UriwbYHSYU 62SzXgxXJqyvpCyPWMv9zyqfEe+cYZFl7t9NhnpA6q5hrrEZNYmrWgvLT1JCC1euyszV V8Yw== 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:in-reply-to :references; bh=lysenVw0FcLkOsE9dNptZVbpRlL8/wbW7eflKfOEXB8=; b=kmLAo3g1cDpZnJidUM2zNp4hEKoMEuLg6AnEywyBv8wa3lTw9BtXl/5M2rDIWkQl+H AP1FEzwoUgsyZdnF37e7icHI7VlQ9R4oWlhyxoYxwP08EJ1W9nJjflbd2vyXre43ER5b RDjey9C31+VmG4WeY//b4+XeGlfAyADLdzAKBzwJeoWdAL0ZrSWlLY4Cqhg9tsE8T3ID YK+lPxMnlSx8vgCy/Cfsaz511ALP6HCzLaG+FzML4F78sx0MiarI47oldeUlG6gLaIOZ 9kgUfuZzGaxuJiJdw2/sPWKSdP4/IdxFPWzIqtw5QocQtaSWReDwUM+fixE5CqvVEY/e DbAw== X-Gm-Message-State: ANhLgQ2ycYN+iM3yDJkyafypVzgeUyjJjAOva5y1L4yEsCE0Wyzr25cJ jmbK4dAAWmWpWK8NXe94plw3Z3hF7HM= X-Google-Smtp-Source: ADFU+vtlsfgF+GdJSU4flPnU+aKPn/mvUq0nO+gKY+7RuBJKhdoX1pGjQ1vGf1i5fZ6o1d8HjU9wQQ== X-Received: by 2002:a63:c212:: with SMTP id b18mr3946366pgd.92.1585398499641; Sat, 28 Mar 2020 05:28:19 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id d23sm6078522pfq.210.2020.03.28.05.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2020 05:28:19 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Mar 2020 17:58:10 +0530 Message-Id: <20200328122810.25084-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200328122810.25084-1-gautamramk@gmail.com> References: <20200328122810.25084-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 2/2] libavcodec/jpeg2000dec.c: Handle non EOC streams 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 This patch allows decoding of j2k streams which do not have an EOC marker. OpenJPEG implements a similar check. --- libavcodec/jpeg2000dec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 44b3e7e41b..eb877d499d 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2076,8 +2076,11 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) len = bytestream2_get_be16(&s->g); if (len < 2 || bytestream2_get_bytes_left(&s->g) < len - 2) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid len %d left=%d\n", len, bytestream2_get_bytes_left(&s->g)); - return AVERROR_INVALIDDATA; + if (s->avctx->err_recognition & AV_EF_EXPLODE) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid len %d left=%d\n", len, bytestream2_get_bytes_left(&s->g)); + return AVERROR_INVALIDDATA; + } + continue; } switch (marker) {