From patchwork Sun Aug 11 14:45:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: velocityra@gmail.com X-Patchwork-Id: 14422 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 041FB448588 for ; Sun, 11 Aug 2019 17:46:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D92B368AC53; Sun, 11 Aug 2019 17:46:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D92DE68ABE8 for ; Sun, 11 Aug 2019 17:46:38 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id n9so102563803wru.0 for ; Sun, 11 Aug 2019 07:46:38 -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 :mime-version:content-transfer-encoding; bh=9uyRg0sw29/HwqjAdaMx0tOOYw5fvnAeMYECnUxPHT8=; b=AH59sNCmK2kW7pMj+HHe1VItWCLqULmXP406EFEiW1ygYnGMglg1NkhLhK+UC4URDt 30z5zhBzTLceCzilv9JUw/eu2FnbG+2AOhM/7jzOQJrBZzb9bsLCCY7QrUnLWLslSOTn ZjvrMZlvN20a4DcsREnRJk2FDp6hcLvt18lxiIEK3XNYLISOyFgPARQ8Scrb9Hh46EWg j8PIhK+K53VDqdLnwU/gSEzFiKeCFifw4BNHML+Urf5xfk21nDxTjunjthpLV6ayCeBX +308/WzI/oUnSHSWbejXvl5WPAH0FQVjwyKk8Y+BXidJdlBIQbX5llz+dG1Ka2ij4ayC NeHg== 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:mime-version:content-transfer-encoding; bh=9uyRg0sw29/HwqjAdaMx0tOOYw5fvnAeMYECnUxPHT8=; b=uDtzfKnk34NgllaYwGIiEt17YnKeW2Nu235f9XdPFVA7dSDPPSOdvhU7uMUBlLewAd R9kP+kAlaXG8Qn/EbKcjpdTZxC22RUgClbk8c/tYY3k8x6CII40s1lBJgy3+hZA0+JZR BNv6HcMT9mWJxm/sTx976SCvtSVv8TrbHqo/4XGpeI0ltHGsyye4HznIWb9xt/C6QE4Q zgqnIWOelOfMaGGMgFusKnqck27rmwNlPkT8dA0vGdqBiuqVF3QnV5ikRUBOH5bCboRf awkFYn6PJhAOyypyO5w3vATmMzAR1I1G0l57ivXZ0WwT+ScXQve5CZ714R4jYvuIAVRI Ut/A== X-Gm-Message-State: APjAAAUB5W6BuKoDeoG+MBrpfwxMC+h00Z90L7Gqo0x22QcssaLxn1nr iYcVc8YZbMbOQmK/OWSWd1QeOA2hIIk= X-Google-Smtp-Source: APXvYqxcbQr5dU3VcJRyN9f2ZPC50pG+EYNoTgsQOCCxXwqmFlLB6sPNS/U9mF62RWRJia2YnjmPbA== X-Received: by 2002:adf:d182:: with SMTP id v2mr7071726wrc.49.1565534798224; Sun, 11 Aug 2019 07:46:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:94bc:d60f:d153:ccb1]) by smtp.gmail.com with ESMTPSA id f10sm8376360wrm.31.2019.08.11.07.46.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Aug 2019 07:46:37 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 17:45:40 +0300 Message-Id: <20190811144542.11704-12-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190811144542.11704-1-velocityra@gmail.com> References: <20190811073641.GZ3219@michaelspb> <20190811144542.11704-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v14 12/14] lavc/mjpegdec: Skip unknown APPx marker on bayer images 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: Nick Renieris Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nick Renieris Samples: - Embedded JPEG images in the DNG images here: https://www.photographyblog.com/previews/pentax_k1_photos Signed-off-by: Nick Renieris --- libavcodec/mjpegdec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 0a920a7144..1f2fabe2df 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1807,8 +1807,15 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) int len, id, i; len = get_bits(&s->gb, 16); - if (len < 6) - return AVERROR_INVALIDDATA; + if (len < 6) { + if (s->bayer) { + // Pentax K-1 (digital camera) JPEG images embedded in DNG images contain unknown APP0 markers + av_log(s->avctx, AV_LOG_WARNING, "skipping APPx (len=%"PRId32") for bayer-encoded image\n", len); + skip_bits(&s->gb, len); + return 0; + } else + return AVERROR_INVALIDDATA; + } if (8 * len > get_bits_left(&s->gb)) return AVERROR_INVALIDDATA;