Message ID | GV1P250MB0737EF0B4641EFEFB8EAA7CD8F549@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 44bdb4efd0753a0c76571a5cbe251c0cc6b0070c |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp436361pzh; Wed, 28 Sep 2022 11:43:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4j1DcN88aUneOs2o6749GkLqin45HxGObepZmc+4Ff/zaySkkz0t4bG5EA+mqctvDxvXAb X-Received: by 2002:a17:907:3f9f:b0:782:a14a:fdf9 with SMTP id hr31-20020a1709073f9f00b00782a14afdf9mr23941889ejc.49.1664390593648; Wed, 28 Sep 2022 11:43:13 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cy25-20020a0564021c9900b0044efcaeec2asi5250324edb.167.2022.09.28.11.43.13; Wed, 28 Sep 2022 11:43:13 -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=NZKqWQCL; 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 D6B5868BBAD; Wed, 28 Sep 2022 21:43:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074087.outbound.protection.outlook.com [40.92.74.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5747568B889 for <ffmpeg-devel@ffmpeg.org>; Wed, 28 Sep 2022 21:43:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZGKLjfaxun0tVbl9KdpD8rAonMxAttSuDY97lBOvvo65BLN8yEa295864KRbJRD5G0CRLCdP64W6/xXMXXMwUZHn22xaRK3QF/G2vrAXFhTMILK7H+421TPSwpWMijrAZaIbwdxNjEwt9alkN3cnendS9JrVhFjvozx3+v2hX1rriqZggR8xvwzUoCF8InJxbzhIysVkNScXz8PsPXzKFhdjAbK8SAHOtXNbPyu4dm1zSFHTjp77lVvQ/uT+N49guzBbIdv6OgJGgW9XlmfPZtSwCutcsMC19XDvvSmYLVvO/lQ2zVtYHRAmeTBXpVYpMwW4QHK+lOd8mN7+OdHX5w== 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=hpX8NQ55a7DJLFNZ/Mw/4DSsQzhezwUGOpCxDsYTIX4=; b=U/QOAQ3xYmsNF480ysyEs2c34jleQtIgwBS7UVuZAt0USABD71ltOVGeDCh4bsSwNO/rn7Lzb2vwb41FRoJYqb0DNbLJwOhFPINFG0RUw7BuHwr2drckm0xoo9qd72EHUvRNkXb2BsGvp3LyvccF39oyVfksv5SYO6k4EVkdSlg+YcWGThJmSNk97+Ksf9KhWtjt/rSTmplKM3YMv/5VQ1AyE2zI1U81VrOHNqzk+a8qcuBBNdCBpBH11r4a3EM3FGCVUSVYfT4HS5Do5dyjoWyTZaVJKXEpTqis3EwJGkJTQhuISIbfpIvPz13a8w3UjSB4UXwD98HcB14yZyKgmg== 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=hpX8NQ55a7DJLFNZ/Mw/4DSsQzhezwUGOpCxDsYTIX4=; b=NZKqWQCL2hVNnrPy32A9bQfRuctscJERHtp333ABP+RYh3wBvf/umtkwl6jsZmBiwJd4mxfmt5vIf852+nh9iAOaWu5dqe64XamnOPkeJev2Gdu9QryHUFqs2zw3AanqdE/7uRKrBg2JgN+46NznAdPD0KC+sfFjXx9NYQH1zJioxwo+6mL0nqx7HgRsAy///4Tp5o5bl9grNx5cD4VAjWWgbDwvlYlimZzwzkxkeP3caA441Q9zNAHwxeo5mIXSsf8FKW4VmvJtt/BwA649/YTHmEndaawNnYNBq/lGlA0vjtCvILc8RV2hrw1bt26ZWPcnlzHLd36g3Ib7EhnDUw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0132.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Wed, 28 Sep 2022 18:43:02 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Wed, 28 Sep 2022 18:43:02 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 20:42:59 +0200 Message-ID: <GV1P250MB0737EF0B4641EFEFB8EAA7CD8F549@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.34.1 In-Reply-To: <GV1P250MB0737853F680D4ECA74C45F1C8F549@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> References: <GV1P250MB0737853F680D4ECA74C45F1C8F549@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> X-TMN: [rZO6Q9/i+Dtp+tLgl8zUBRrUWAPzdtjpESHaiL7g6vg=] X-ClientProxiedBy: AM6P192CA0099.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::40) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220928184300.937509-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0132:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ec80c3d-7a1f-4f32-c110-08daa18145e0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpPcoZqFl/i/jhf7c/pX34TVzuF6PMUfbqmGUYupH49yvquJjpx425zJN+JYnI4a9vVUyPIk3OEYKB00iIzAAjSvAGEP62X4uajc9vldLBwTf6IHV5J2tqB7hluYdZiCLhIJ7BgPZY80FFMeVVVMYRe8obr0N6zLDAVJxtFW36MxhqRnq0uhuqAehPyoyV/fXHM7ACibh/TZ3F++tmUYXvRIS7n5l3iSDmV/GMgxCknMRnbY6+L8S4h1M/5FAxRcMIfvoDqZ2/ynjhJ9+FjYGLy2ZQKuUNK3U9I+Id38fkp6xGwDpuJamt135hs3kUebDAhADrwc0l5fcxZNgr2vQ09VfYGF1gytaFRfEqFS3RI8/83tyU4AH07uwgqWONeyx41E61KzQVwYX8rF1MP/7RIyAu6EYABYqMlbOgOkC9wkBowT9kKQrrJU5Bw//r4hcdK65TDnxrQH0tSJX87XmHJZbGXsN/lGErYyMCNtbchrFX6q9ST27ITPhHOfc77J9r24D9uHi89G6qMbOqpLLFyAemi4VhhdwbwdHItwzDYtvePYMtcMxtpg1daPijQ/VZuhbXqyRzHb8QUYTdjvkK3PRBDQatIdvPENeRERJ7uQLrdCIAbEa64mESL9giSssLp6Zd/eVWb2DYVGVXuwp26ofvBoki/ambuz/BgBE99q5H1lznqjwJUJ218Wcx27M0okwp1qBys6UMFJr7BJW82dnIjL6qC6dMHPxSSg42IfI+36afrg/BvW/DE3NG/QDo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mN3+oTBtrG4nif/ve9Qrnop3QXhXFhlVHpk9QaGdwWujc0WJhF/ie5RK6xE25aOvoUfDP955ltjLtC1xK1J8EvtI+2Vegp7Wmo3BDPPuAmoIeAwko5BvYpj6r56X+pgTEkgPmr4FYYExayBCRXvf5A3FxRwRIG9Xjc12MnXQF2q9N2L6BOWrF/yoUghUvkSmvfFPcrYrh671Fcw7eYOMVUjPOTaGC0rAF3Q8XqFps3H3SnDseGFXkooew1XYG83k0MP7hDPOQ9XwZrc+/JvUHvBf5XkuAliTo5RwBdqdVUt4Wu2MyH3xtBqAxoU4iLk+mrZvnyI5/zoDnXgoYNZwHoD3bg6Bs5tCbvu4gXgjAbywS9BTWqzkp+cto0rvBz+jYs5CY2E+hByUY56CF9opNA1akqkvP7rY8enw8Wu6aFjXnJOuQCxOE+ZAee/CV8LauHuihTFfXjfXYFsSmlFHwkDgxlSiN1OJszy/UWjy3G5SWCgsOT/sBd457lfltQQ2lk+TyXjECnKBBLCliGQw01olSBncQjX43F/NxIsmz93GQmGAjjiGUb+AWc/AowSB8NIhEMiwDl9wzMl2HBicBYVd0/EwbgpvkyQIDie2amfHTAaj81OeY4ARRgX1/MUiJXRF+eOtv559T2T/Di4zzw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KLT0wrybgLq4EYdv1uxV3cLs0tuifjDa53mUNAU7Dg0UvcEsxCPTY5VnkfhMlwN2LWEbzH9mtgV1zfw6sxtkN+MxbulnuRDvqx8MlO8n/q+OcjaK7Q63U1Hsjxf5+VCK0IPruGVm4/+3xRpbQymNUMPhgsEOVA/fdzT2E5KjpDqllWwolP3cIE2+wdTsOewQ5W0JxQMkpmagnZvNnjSnFlAyFsIAv/voNFv7gHI0XJ9vZKRbkPfEy+ZUa59HHpVehCRjbM4m1l8FvKS80xl5Am0dlnA4Rn7S7XRw3ECl90+O1YAzaxAHqZSbQ0ycRvnvDOH5H6EcChMYnxpu3/bIesB5tBphbO98ANB8+HboGCVhsHDX9FnkVX82b7kd0HtGr5XsUKEpsZfFfXVAKAE1DQm5nWyI4PhpLZxq/41I0LjfcVhraskGFU5rKUGqANnQkf4DvfBdZro4UKQ6UJzeZIPcT8PuXKCf9/2on+FLzB/g5XsAiMUkaRGGZ/4GhWuOnPmpO4jP8XzDl7feXLZVs39sWIuoFqYuBOWT9T3k2ycE8MSoRcXKi1/piwXNr6g3Og1l8HppjJ1yEJxJxJ1iWbUL467Pz9qtXs+JPcH73RRo5RjnWwt58U4fgC1R2uSuDYIjgS2d/pwoxpqmWZEBcj5KVITmiMXrhnc3icwZ7cW+Ferq9GcVBbvhzuXWF/DEtmgpw2g0dmHCRltlXuIqjOKUwwFe2vQiHBHvK5SKIBbnJx5yI2VI1RRBEHe4+yUVIr4gwnU35RLNJUMAjoNFjJ1Zfd/1JrQw9lVU2k6pETJ5BHY7wW8AyK1A1mvbKOUkKZ4qDiXKw94eFDQNAF4HRpE/QONaeaGjJaoeXLySmaOBXgMjYbuYgrDPcXet4JhVrFGaIH9tLvoyw93zbjcN8WeziVw2R6+i6vXf8Y2skrvZYmvYX65eMzykdFHW5MsswiHJtAr5D+KGC0ByywV1XGwvY+1Fk6d07ZftXCdDkZz/43S6ZckHBsfK/MHvk9agzDiDayDP/hHUDIK2yrfDg/EEaUFuewfsp2RP4P4JVgNA0wvI0iq3rkygSfM8/6zHXZnyInifA0qZjX9+PLuOHqfh+qH2Uvazqa59wlw9F5hTSFHj9/QRkIndLFeHsw9RGTdiXXLT7FgqXD9p4dN7q0Gs+wvZltGarlF0LSnxE/ixuVSkFDgwYPj4y9s5vTBjjRNdZ0A5RvchA7OzeyWa9YXs/0Bca+Cy0+5neaoCoIr7zRxEz3+IvyA6JzZPOh+csf6IPV47WPN6UGs2N6RaYd9LbWbJVzBDecSy8xd9OWS6unVkcd4Ewqt5nwP+uyyB X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ec80c3d-7a1f-4f32-c110-08daa18145e0 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 18:43:02.4382 (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: PR3P250MB0132 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/wmavoice: Check init_get_bits8() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: 4rxvy2DpKCMU |
Series |
[FFmpeg-devel,1/3] avcodec/wmavoice: Don't initialize GetBitContext with buf == NULL
|
expand
|
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 26744719e6..bb98f841a5 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1911,7 +1911,9 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, AVFrame *frame, * capping the packet size at ctx->block_align. */ for (size = avpkt->size; size > ctx->block_align; size -= ctx->block_align); buf = size ? buf : dummy; - init_get_bits8(&s->gb, buf, size); + res = init_get_bits8(&s->gb, buf, size); + if (res < 0) + return res; /* size == ctx->block_align is used to indicate whether we are dealing with * a new packet or a packet of which we already read the packet header
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/wmavoice.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)