From patchwork Fri May 10 16:54:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp717530pzb; Fri, 10 May 2024 09:55:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXj31YsZsmbu7nRPoJYCIbezGFZ4h2WchFXijRWAQ9VA3AhSK+dToAyhBacZ/QiSJnSR9y2UTMptfOgXRwFhQ+T3oIZjZO83L2yaw== X-Google-Smtp-Source: AGHT+IHhAXreSQUitz1oVwITS/BJO8mQr8wEr3Izs5LeJxpQDZuSNAm2vYONLpK9qCRLPiq9nCej X-Received: by 2002:a17:906:3016:b0:a59:c698:41ae with SMTP id a640c23a62f3a-a5a2d30bed2mr284146566b.34.1715360114833; Fri, 10 May 2024 09:55:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a1ba0d8c5si207941266b.692.2024.05.10.09.55.13; Fri, 10 May 2024 09:55:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=NrwyhoR0; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF0A868D4ED; Fri, 10 May 2024 19:55:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2080.outbound.protection.outlook.com [40.92.66.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29D4968D352 for ; Fri, 10 May 2024 19:55:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3Z7woHpVyb6WXusrPYCTdvuDEPtyJqxHw8LhTulZH87JnkAagTY8MQ9CHBo6kfm/ThpHAWGUp1CGv4fX2jU4j1itKxirm+WLCGwx/bFcuJn/KKq6XvN13LbcYZwNKr+KRcWPQQDHZNrxsER7Aq4a/0oG9TWHayazqZbCHIi/y1OJZKWoKx8sbqTxOPSG5Rs7uABzqjAcWGqYW4MU3qg015zJk+ArpJgg746cZykkW7sQY7kOjKqzNhwTJ2nu/6oylknEKv7ti/ZnAqxOOZ4Ap8kvhObBfNAvA2Fa4na6597oFKobHyO4+dU//hL8SzKYuWM+5gSxNU7k47S1uXMGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hMwv9D2DoAEHKVfY/YqHWLtdcFVggoyUxKnT5R/g/pQ=; b=NQTgsvYGZNipcXghh+6tQMKWaFNO3kYCBK8dnfZZGEx2sshtrc/UznbVdUzz4V13W210AsKWyPkjIhc1d7JKvkyqMOFwf5I4W3LAZcfclSVra1b0IE67zA2o6cVMbfIl0f916MXxHDkMB/nQ+byqahP6kvDzpJCKh9/65EprlII9wOV9pYOnNr5/6xqX2kBY0RO4wZ9K/CPX8qjbEAYQmMetswyMa75rRyq5/HG4o2PW5XmYCo/2QfzT8g9kzIhUnNgDk3ww/izqRrgG2VX119AK0Qvb4bZrJn5LYPHj7vjrVoc61Dn2Sw4LPNYqsR/qSk+ECHnmKyOET+lrR48j6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hMwv9D2DoAEHKVfY/YqHWLtdcFVggoyUxKnT5R/g/pQ=; b=NrwyhoR0ND0i7OB8moUuxkg+k0zFu/jayyOJlRWz/FVqstuzWY1X+nXfN2t2mUE03XnXjVVpwfwaUIbqu2eOySoC8+FMNnnSjgp/HT2QeBqMnzgswf3mQsy/PaQCTiei5V6G8dK15OsuBVjGvxU8QpMpKvD93YiTfZReNvBHw+Jfx+9g0lksn3RbcSrBChjJuBK+utI/WLjzVgDBigMmkTJ2MvPf4YHoM6tKC5FWSXulBfZMf1KTFM6gxc63Zr69Gl1qLVB8lntd46UUoHc9T99XMI414w0yNpZAU8n9U9rFAev0uFnPJyDY5BGB9h5t6dJ2XFRA0z1NZJTQTHffdg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0283.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 16:55:02 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.048; Fri, 10 May 2024 16:55:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 18:54:50 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Ap/Ql0h8TrKSdgfJLOuMGm0RV9yv37NkWEkGQdOg29U=] X-ClientProxiedBy: ZR2P278CA0035.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240510165453.507414-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0283:EE_ X-MS-Office365-Filtering-Correlation-Id: 16dd3e70-7e0e-4abf-9469-08dc7111eeb6 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: ERZTGDBqOxDLmn6kDKrgc7X7FpfvLdwcFDPIxPaLnbg6NmGk6DjVZmjJmOM+c/FP7ZuDoXBZsnzOguSVMhBHvpn+uGfn8LDyRLc+lHVd1rItnxpT6O5Mt51CdcfFrUnHEh3Kia3LWkhMkhwkxKfRo2HjIm69Q7eQ9T6G3KuTABtdo3XVmuOrAu6mw1I2wWE2EVrp3hnwfx5iSjkAKy0EHMGcdMzDqsPyllgzVGPHoITd7XxYWgFfK9FEMPHEDIrEVHfyxq9mu0f5MXe3cFJ5Mo0i/kEOAKZgUNlSamwzjvhB3zI3aPKwhlUe6fsTPMnFiEVGRqHWPRmLPiPHUo19c9HQ9bgiQGcHpnQ7LuA/zqtfve0NJlU/7vJVhL3LV+eaRXcx0ya9S4po3JajmzWq478df1fYWaVjAJ88ph5Y9jt2ETetQpQEaExrQb9cTpHoTgKy7OsfOFxd47DO5MqJP/oHcpRbJktVhUGENJearWso5hIHKACyEojjG/XR9XYvqMnsCTyumV4MS9sXxICAl2krgLQpfC7tTOFGMtK1oPl3ZcOpSgDv6sFAyd4TSigUUGYk+X7tOIY7sqpg1yOzMJR3ns/K2MitdwnWMXof9eCnhspvVUVoZGFYNKjGE9M2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qv2WardXDOa6jJ8Fem8TCwmE3JGpldPrCH/CbJS1BQypUdJjRT07AsRstYArHq4KyDylUa086eNWI5XJe6dZXhDpzaGNQQ02PqGUJst4UNmNUbtI2VcK0XKWsroE3CWAqXAqgOx1/o+aSPSGPQNjdmaxZd2XhoOrK2A8HTyGmDxCD+XoDLsk/141IL+tI6p8EBrKIW/Yqlx4nsiCbG1uUN2v/UL6FGtUpwTjlD7To5jrXeJVnN9ok3qg9yTCmSjQtfJ3UGQYseAA8aDE6phsZie3D2btrk1661NvYRwo58Hc9OWf7nKx74oLX32lY6KRw9h3t7dQgKo0WY8e36JqlqI45DSjOtCWKe73J0B8vwr7b4I1J42Js+cD4uw+7cgiOGlElqHpgP9PfYlB5W9lHMYFk+XLrwVG0ih+qTX6DQ1FEm5/0kE8cv8tzniOrVInui1LvHKqHFw/j32DqtC17tW3PgqhBb2V7e+rxlHHrOtl98HfJ/7aWvyvvCuhX36vcbwHDgXblobGvtZkKw1nXd4ZsE8vjd1cSkBoFW4zAmHB7KoI2VaKGdq/CRMy13MeXaLVyPo5kQjaQna/inAQNYRwR1Y5o5LikKEOmO6n2pDI/4cicbxJSxbnO1HOrw0sEZHuwgoti8Ab8Y9e2hx59MGxGjU3gpfCAHJ9RPkpKstU7Rl2rSS69Hv4c1aqIjMS+BRrLX4nyHOYD8Y4Eq++5WhmUVeEL0dfFQqck1nS9kr6Fq2WuYjSyq8wqZLtWSkpqYaOIOqWNzo10u+sZDJ+hP7PGskVOOIazbCBubjujgt8crDwJgUSBd0IwnzTIgcxW67HC3oQXgEYk6k6EJf5lJy2jGPSxORpRjfwdQRR64DlzhoL7tKqax+6GKmImTtfzWhpb3YBk4zW46L/WU0qaq3gG0CLiKYrHm9lqdXZq82nbSHn9bMtPWcxNMdT51HmkOBHEMTmgvTH1uM1gEWJQIPFksNhFyIqwQv+qzgYPBq9NJR4tn1i09/cvpigOAkQ2tNpkMtnPptlR4XsvdQXuSExBdan0XpHGATYrwmflvYhaKXVAlHy7GaKIdJ+/qg70P5vd+iOBn3M8Pt0ycdponpZnHVHl7yHYS5YCJ6SEgwDRRCYjiiw1vnkbFlMXg1/rwxtKeM915hcu6xTMKbspFu/kS4E+TnZe79qBiwMF2Q5lo+OuhL/VPKBT6VP4MGHNcEkvpsrDzrDPaXRAEjsk/7dFO/zVsytsjdsxbWlkoDnohklhFWkYG+bdxn0Ua6bRxQ/IaFhRqutBqXDR4m71Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16dd3e70-7e0e-4abf-9469-08dc7111eeb6 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 16:55:02.1189 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0283 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/adts_parser: Don't presume buffer to be padded X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lTTEsyB+WkIg The documentation of av_adts_header_parse() does not require the buffer to be padded at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/adts_parser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/adts_parser.c b/libavcodec/adts_parser.c index 6c22c86ef2..81e2669149 100644 --- a/libavcodec/adts_parser.c +++ b/libavcodec/adts_parser.c @@ -28,9 +28,14 @@ int av_adts_header_parse(const uint8_t *buf, uint32_t *samples, uint8_t *frames) { #if CONFIG_ADTS_HEADER + uint8_t tmpbuf[AV_AAC_ADTS_HEADER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; GetBitContext gb; AACADTSHeaderInfo hdr; - int err = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE); + int err; + if (!buf) + return AVERROR(EINVAL); + memcpy(tmpbuf, buf, AV_AAC_ADTS_HEADER_SIZE); + err = init_get_bits8(&gb, tmpbuf, AV_AAC_ADTS_HEADER_SIZE); if (err < 0) return err; err = ff_adts_header_parse(&gb, &hdr);