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 BB80A4D177 for ; Fri, 12 Dec 2025 07:04:14 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'ifX52prSjG2HQ69js3+h+VbOqCJeS7nIN+kf2b5iNag=', expected b'ukam1Y2paRdD85g2Pr7cA8rdCBxEGXX/q4Ntwuq1jN4=')) 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=1765523039; h=mime-version : to : date : 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=ifX52prSjG2HQ69js3+h+VbOqCJeS7nIN+kf2b5iNag=; b=ILLSBLl0wYJ4pTxbIMz6+vpYfy6Z3gyLmWzQv4BXK7kMQ0ds3lHWzxNZts3zFH/I4VfNx 5d8iUzIha+AKcbNGCxqSVn7nRE5II08HUFfF38kKY1dg/ST520dNXXHnn1+gqL42GbW8Dsb xw2XVU/kI3SBbdaFOxMIEHY1dkqDFIhm//IxUTcSsqK9w5Rk1A3KTN/DIB4y1vTUmU4HR8M ddJ/o6OSdqAgEAdCKVMwC8L5RxQ42leJknr/z4fslwkDQccy4+SY5IOC82ohiW6EvYSg4lu ynWVpSgyAIutL61Gnmz1UzIQXp9h1Sy0oK0c9K60Ph01Nf+ZPBHsXB2wkDVg== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 923C569084B; Fri, 12 Dec 2025 09:03:59 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1765523020; b=XIl+TX0aZD5Hah+wsT4uB9IcUgOXVqwimQ38+YkOdQM2EaHQueo++NlLjX6jz7LrgXQ1k zwSc4uo7mlZEvzDK6JrM6VtJuXsCVvDa/Vx8vjKNx9CqZGPRcHc24++MzPE5Ss95SJD+RFZ fzxyX73XtLr/1oWqrxBRNcUbDjWW0ysFLC1hPp6b26N95m/LwNCDxCPycgTp/J1gI/Na2yw bM6dZg72a3TSkCKmF20FL5jdaJfvDQpJUJ+8wAzrsAmwuT8j9wjXoNS1IPqrooWxqXgWPwi ZvVwm2Jxi3AyTl0TUBbh8t8wRd+TTQSHtCl1Oy/AIUCWVLqadZWLQTZ6L9PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1765523020; 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=CJtGQHLookr2L1zYljwfwzKvaqWBfZmgG82pZKR/j0o=; b=b4Mg/bgbrPXL3XouKxbaVZkk+vnBPdONC5/k8MNG+JFD6F71oqRPRFqWef4EbLKYDYkor kJsz6192jxZFAMwarHy/CGCLsnhXR7AOWMv0nFblUSbpKYSzkiq9/B8kMyEGv8gs5HebeOf 2k1Ia7/pWBdZHcxZ385zY7AAiUc/EuszwiIKpJaR8XGW/sKR8cpCKxudmd4hc+NkLBKJmb5 Sosmw0Wdgc49A0arBkwO1Ir31GWS5WCjRx+ciOEs7qmxPdROxMdWP4bjwoVf5ENCL2onoSr +RnXh/2sTpEOsS/nBIk05ifqOnEnU/Tw9cPNVUNK5MxenIZ4yoahKvlfVxxg== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765523010; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=ukam1Y2paRdD85g2Pr7cA8rdCBxEGXX/q4Ntwuq1jN4=; b=Ez6Yg22qRBMz4C7btK5g1Kv3BQhdBSBcGq4TpAwNCPM0QwWAviqj3aqx9+/bATAIlm+yE FvY9yzzwgZFiLdRTwZsV+B6VnvFeiw4eEkr/8MxYJXH0Vppm1HStg72b2lBJ1Q7DJZHjbOy zgYpnpiqW/IfolM8YyAi49+QFtVc3njWflFJKzXJIXDNRkTF4Fgq0Q6BTCb/6EmK9CvovFS KDsqaG621ku9ZNLK0ma8LX5taFJYS3i1CvOZaCIW8Y9I1cip7ro3K6WeRebswTgEKVXzupH xhwWvYsHImZFjtBxXbPHfaA5bRyvLuF8QtROkUq0r1pf3bx3fOw/qNJxF1hw== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 75553690764 for ; Fri, 12 Dec 2025 09:03:30 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Dec 2025 07:03:30 -0000 Message-ID: <176552301071.39.18178287503009943516@2cb04c0e5124> Message-ID-Hash: O4HG6IHVBP5G2R4PJDOU5RIXUJI4QOJ7 X-Message-ID-Hash: O4HG6IHVBP5G2R4PJDOU5RIXUJI4QOJ7 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation 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 X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/amr: add P bits check to avoid mis-detects (PR #21176) 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: Jack Lau via ffmpeg-devel Cc: Jack Lau Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21176 opened by Jack Lau (JackLau) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21176 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21176.patch Fix #21056 Refer to RFC 3267 Section 4.4.2: A ToC entry takes the following format in octet-aligned mode: 0 1 2 3 4 5 6 7 +-+-+-+-+-+-+-+-+ |F| FT |Q|P|P| +-+-+-+-+-+-+-+-+ P bits: padding bits, MUST be set to zero. Signed-off-by: Jack Lau >>From 95a39927b24e649019fdaf640dc7dd45ea1161e9 Mon Sep 17 00:00:00 2001 From: Jack Lau Date: Fri, 12 Dec 2025 14:52:58 +0800 Subject: [PATCH] avformat/amr: add P bits check to avoid mis-detects Fix #21056 Refer to RFC 3267 Section 4.4.2: A ToC entry takes the following format in octet-aligned mode: 0 1 2 3 4 5 6 7 +-+-+-+-+-+-+-+-+ |F| FT |Q|P|P| +-+-+-+-+-+-+-+-+ P bits: padding bits, MUST be set to zero. Signed-off-by: Jack Lau --- libavformat/amr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 0db0a8d26a..9cc61baf55 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -144,7 +144,7 @@ static int amrnb_probe(const AVProbeData *p) while (i < p->buf_size) { mode = b[i] >> 3 & 0x0F; - if (mode < 9 && (b[i] & 0x4) == 0x4) { + if (mode < 9 && (b[i] & 0x4) == 0x4 && (b[i] & 0x03) == 0) { int last = b[i]; int size = amrnb_packed_size[mode]; while (size--) { @@ -201,7 +201,7 @@ static int amrwb_probe(const AVProbeData *p) while (i < p->buf_size) { mode = b[i] >> 3 & 0x0F; - if (mode < 10 && (b[i] & 0x4) == 0x4) { + if (mode < 10 && (b[i] & 0x4) == 0x4 && (b[i] & 0x03) == 0) { int last = b[i]; int size = amrwb_packed_size[mode]; while (size--) { -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org