From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B4AC84C2C2 for ; Wed, 3 Sep 2025 23:49:50 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'1XQlhC+o+kKajMKy6d6cKIsKEaePaIQ6iiDi132EwAs=', expected b'Ss/Ieoz+hCyhjlHQSQWh8uNjMpjHIDErAN/Nj5nywHM=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756943368; h=mime-version : to : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=1XQlhC+o+kKajMKy6d6cKIsKEaePaIQ6iiDi132EwAs=; b=ZBFUeWBEF7g7h9eNgCXan4n+d/tVbsv7M+mxp+zc0qniU4BUZIPOyIUMFM1deEM2WTfNu ADaViFru1y3HvRnob0giJZlk6wY4TYXxgTpHRz/YweMY8XjWjcUk3dajszja8aqBWx2pyMd npORXj4x5qN+Cw25x92R0voQlqIEA0YVfYGjjXaW8VfMAt/fjqQ+N1MSQiSUTzBiY7QiQnF bgPzpGznXhLQOXTTr6tx6m5UXTUu/BFY9pDjk1JFckOWGJSTfBpcmIjqw6Oi2zBnXcYr3AQ fkUZSm3KbO3Z1fV8kcWVE5pA+F7wz0WfBYJmHsR8A35ZNS8st/fLNxD/ES3A== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 698EC68E75F; Thu, 4 Sep 2025 02:49:28 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1756943355; b=Z0RFYCdbhPVyxO1S1Vl3WezMSa0DUcdvXyQqJQdW5iN7pqjqY2OcWSIXEo2Cx81SLrssu aHQyzIDtsu9AGdvQcLELAPBAH9v/pENuRBILWVPwU/OKUgsQV/p5h708nqHxLF3qplo0V8Z g9YU3TS7DdC2D/0Cb3f20sj/8mJ8MoLIW2d9ufg0OErYLs0XO/w8pb+875ZtH8kyonu74Vg S0RHAlwH4j/9gPi1TXmUcQlGLTFRMR1Xnv1iNBZF2JTFkTApIOOEw3qyTySbJ3D5KpNGKPa uUX/ckev0za/L53M3vlnQZfPHd44CGUVMuD6aTNItq6CGqnXuj9Cilb3pKzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1756943355; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=Q46PbxItAiLH2mAZ/9FrOFyFRieRMDShe2sIVdO8D1E=; b=BWwZwW6fHX2BGhZiul/Y8lNodFLA5l8Vi+lM5nQoIPk/SMdgY4Fv6vCLzHPYwwuK1SgNi NRn0O6aeOEJyepa4PavGvFQRjux4V02rXfcAGOFbuegvQwO2RTslR9YJWFickPHsXi2GY3X syQ2bt60o+NM1BZf7RgWNqQMraktBB0KhR8aLWaNIbwHGBRBb81g44pLhjW5q07UXS9tUCv k7Cjxi8ds7x1VEXAm04ZDkBqA/BAqFkYHOcDv6j1gNt+yA+DtP/tcfLRc5up7IDJ/yoNed2 ob6E1xMmvkm2u2ymaEeMvyt2urBagVsV0V3Oe3vWLbj6OT8I0tpJKKZqiLiQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756943344; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : from; bh=Ss/Ieoz+hCyhjlHQSQWh8uNjMpjHIDErAN/Nj5nywHM=; b=O287Vq0WlQ9JSjT46YKORURFFRwZ8fTrEGJQUkGAm3D5DrVa4Oz4bGJzvG+NpHrQokTUk hXXlqhwjv63Pdr5zPJad7iHxRliKDhzx49sBojZXldwbrRcPWJ2qzlnyFihFBjvV3SJPC8w 9cX7cVSC3CccWnWk+KLrZUiDhGicz4NpR95hcWFpRKylTKhXUXL7WH/QL6NKgA1QKCEmdjn sYdye3OII/h5QpulWfxz7NC/OwCkQ/HTRugWl1C4irXUu66UB94A1V2MzljYSiniQHTeVA1 4AMYAgqUcCxs++6zdGkqr4gCS6pwpCMl2d+LTOjr5TYgwMERtRJyEtSpYMuQ== Received: from 5d8f51c41678 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 3BCBA68E71A for ; Thu, 4 Sep 2025 02:49:04 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Message-ID: <175694334437.25.1202515690322753656@463a07221176> Message-ID-Hash: 4A5VV43BBVEJVVQDDIDFRYPRKWHN34FL X-Message-ID-Hash: 4A5VV43BBVEJVVQDDIDFRYPRKWHN34FL X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: ignore APPx stubs unless AV_EF_EXPLODE is set (PR #20422) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Ramiro Polla via ffmpeg-devel Cc: Ramiro Polla Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20422 opened by Ramiro Polla (ramiro) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20422 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20422.patch >>From 073afa4be351bf99897033e5299cb680109727a1 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Thu, 17 Oct 2024 13:00:11 +0200 Subject: [PATCH 1/2] avcodec/mjpegdec: fix skipping of bytes for unknown APPx markers The loop to skip the remaining bytes was off by one for all markers except for Adob. This patch uses post-decrement instead of pre-decrement in the while loop to make the len value easier to understand, and updates the len value to reflect this change for the Adob marker. --- libavcodec/mjpegdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 4d6379805c..c44d7f8181 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1934,7 +1934,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) } if ( id == AV_RB32("Adob") - && len >= 7 + && len >= 8 && show_bits(&s->gb, 8) == 'e' && show_bits_long(&s->gb, 32) != AV_RB32("e_CM")) { skip_bits(&s->gb, 8); /* 'e' */ @@ -1944,7 +1944,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) s->adobe_transform = get_bits(&s->gb, 8); if (s->avctx->debug & FF_DEBUG_PICT_INFO) av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found, transform=%d\n", s->adobe_transform); - len -= 7; + len -= 8; goto out; } @@ -2153,7 +2153,7 @@ out: if (len < 0) av_log(s->avctx, AV_LOG_ERROR, "mjpeg: error, decode_app parser read over the end\n"); - while (--len > 0) + while (len-- > 0) skip_bits(&s->gb, 8); return 0; -- 2.49.1 >>From 1bee4a6ec5ad5cdfd15ccf09fe7d45d59b00a060 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Tue, 1 Oct 2024 20:50:05 +0200 Subject: [PATCH 2/2] avcodec/mjpegdec: ignore APPx stubs unless AV_EF_EXPLODE is set Consider APPx fields that are too short to contain an id field (32-bit) as stubs, and ignore them if AV_EF_EXPLODE is not set. This has been seen in the MJPEG output from some webcams (such as the Logitech C270 and C920) and the JPEG images embedded in DNG images from the Pentax K-1 camera. --- libavcodec/mjpegdec.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c44d7f8181..3dde759fea 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1859,20 +1859,22 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) int len, id, i; len = get_bits(&s->gb, 16); - 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 + if (len < 2) + return AVERROR_INVALIDDATA; + len -= 2; + + if (len < 4) { + if (s->avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; + av_log(s->avctx, AV_LOG_VERBOSE, "skipping APPx stub (len=%" PRId32 ")\n", len); + goto out; } + if (8 * len > get_bits_left(&s->gb)) return AVERROR_INVALIDDATA; id = get_bits_long(&s->gb, 32); - len -= 6; + len -= 4; if (s->avctx->debug & FF_DEBUG_STARTCODE) av_log(s->avctx, AV_LOG_DEBUG, "APPx (%s / %8X) len=%d\n", -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org