From patchwork Thu Aug 12 04:50:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29477 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp410628iod; Wed, 11 Aug 2021 21:51:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGaD7AeM0PMpk+3JFEtvnxP3CxBHvL7YqZtz7ggWgVkjWVJw8iz0UWXSxdfgGnixYvy6xm X-Received: by 2002:aa7:dc56:: with SMTP id g22mr3228235edu.129.1628743861621; Wed, 11 Aug 2021 21:51:01 -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 n11si1471833edt.458.2021.08.11.21.51.01; Wed, 11 Aug 2021 21:51:01 -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="hOp/dTJp"; 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 BFD7E68A2C0; Thu, 12 Aug 2021 07:50:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2011.outbound.protection.outlook.com [40.92.91.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA194689AEE for ; Thu, 12 Aug 2021 07:50:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZNM5RqFaKxWN5uj7IzGyb2doiIqs3m5zmOuYy21y6zaVHCae6TG0Jm6KN3vm+yJdVpafrxMIFfl48nv49VFtK3H3Myw9zQAW64zAIbMMCe7fFr1egvSYTeQ80A1l2zB677D2A4uE/QphYcvtcsO9Bvh/4M21Tp1Drxua/5eyQyIfT+AqpEm4S2w/Cd1Exxo9aNqekAFh0lGYLIUdulyhvruZPnGJxBUIIHLL7615engqiUzwT9xnq92ebfchvho8D3OQS5h8rld6fYiZ0FDTdvCk3qRixS7Nzc0s/G2TWQTtmrndm7z0aDH8d8YWcx7ZKD/h6x00cgwdsbFuyhZ5Ow== 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-SenderADCheck; bh=5FA4K4bqrJ30PgaDyV1+emngaX3nhr9WrArrXUPJTqE=; b=OjEqR0lLgBOIkSyD4NYyvnNteFrZMIQCBssCBSrNjCQnfNZyvC0BygsDz/KhvMY0tmzPItkomXxTTmV0GnR2TGWvP5Ztjb3WArg2RFIjUbotdvE1qsr3LOcP6L8xuJSN8GRlamcKtBrLgph3YIxf1Q0GmEgzGFBFnjWLDPWlhMpFH1nj9CW5w0yL6JXhMCWpVj/YCW8oJUgRBndf2MyESx5NcPUhIyBoEku6jO8Olo7tm4Blqd8R1q81ZqUQ5krc4O2VaKeZiKFS5SWhAmsUoYSJo6jZf3BPoKjpbfqzboMzSCxZGac21VZkWKnm0ND9eHvFdkYoEp3rzgFDrtvEWQ== 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=5FA4K4bqrJ30PgaDyV1+emngaX3nhr9WrArrXUPJTqE=; b=hOp/dTJpX4L8PpXlmUasgo2sqPwewjVsMgyeiluNDRc+x4Bvo9AWdKmshHTDqQSlzkM7+V4ywfe6WJ+qcQm1kuYTJVPx4/I2rz8F7/mIPzfobCg4clu6r5yLCfd9dUt6WinsjAhlwdBu9G5RiLNRkTBqZYQokYIYhLOmHvyjadW0c4K17ATIk0d2XT0sY7n4A58xbq6arpYfO7boKW50EPCaxrp0uidzoND/yesRLip6w3RI/aiwEl/HKvS4l/H66GcYXjROC8TwIW7l02ZzOlT6wQCz3gcRxgH/CsA5yORs6lpdTnbIgxqGkV2M3N2rfUytzhH20u9K4BZBtwbPnQ== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::52) by VI1EUR05HT034.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::318) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Thu, 12 Aug 2021 04:50:50 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:fc12::52) by VI1EUR05FT012.mail.protection.outlook.com (2a01:111:e400:fc12::304) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Thu, 12 Aug 2021 04:50:50 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:141464F09486AC6D6D11F64D1B5980195C359401DDDBD44EED43DF84ACB39C6A; UpperCasedChecksum:F62EFAA30B71FFF9306E63CBACF82D01345D608BDC2078C399FB7F6F883AFDFA; SizeAsReceived:7174; Count:43 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::b1f9:e0a6:6946:9c81]) by PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::b1f9:e0a6:6946:9c81%2]) with mapi id 15.20.4415.016; Thu, 12 Aug 2021 04:50:50 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:50:36 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [9FaePhbgrVLizwoDoGzhcTpfoDm4+TY7] X-ClientProxiedBy: FR0P281CA0016.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::21) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045036.4702-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by FR0P281CA0016.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.8 via Frontend Transport; Thu, 12 Aug 2021 04:50:49 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: db9acdf7-4a51-40fd-e1d9-08d95d4cc1b0 X-MS-TrafficTypeDiagnostic: VI1EUR05HT034: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xezQLUqQQqSrgKlGT1mGMCVdg4cZyy4ZytqOTEWY/8vrfKWbp+waw84ZgSv17TmN9AREx78UxFwaoUP1QQFFKxp+XaeAcJWfaBxImhqmfKjqT9NV7whLrB1NCNMZJ+VuxyWgjNI19l8ws7Y7z4FMgNZPI5c/WiU0a72lmbHduwHmAcrs/5nfJwsQgTZPaBp2JSwdgB7xFqufj8CEx/uqHR1rJbFNiW5ef4VA6oAkUYPURHx0PF7Yj6Wr6osu5Y3Z62Ch3rxD3x0orQ/D2q9lg8v2dl9Sfra8wqFRFMeKURaHTWvwmemXgpqGiXl1YhVt59Uoz0q5S4V7StgD/8HYRL/BxoP40ax17y+pe3iSnsZfe2wc7KHuAZfboXUamp7ljNgfCL6F4+Sa8OkY3Q5bzhlp02c7sKh+rMa05UKPP6s9dDqPLs4a8GQQ40TnGzBZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TaYixtx4on38EM+kmUGXV1oqt+OM4iob7wyfMxKONUJotHPSVdRChQQvd7D9BxNqJMRbV+uE7IEuBuFOjsbMyT33LjH5n5O7eBlrU6moyVjaITDQDUWbBmp6M3PpBo/EjaJXUVgQWVH/aT4z8ZxOJw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: db9acdf7-4a51-40fd-e1d9-08d95d4cc1b0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:50:50.1762 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT012.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR05HT034 Subject: [FFmpeg-devel] [PATCH v1 02/10] return value check for init_get_bits in wmaprodec.c 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Cap/nMYORYK+ --- libavcodec/wmaprodec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index e0d00d2d37..23df0be6ab 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1615,6 +1615,7 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s, int buf_size = avpkt->size; int num_bits_prev_frame; int packet_sequence_number; + int ret; *got_frame_ptr = 0; @@ -1666,7 +1667,9 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s, s->buf_bit_size = buf_size << 3; /** parse packet header */ - init_get_bits(gb, buf, s->buf_bit_size); + ret = init_get_bits8(gb, buf, (s->buf_bit_size)/8); + if (ret < 0) + return ret; if (avctx->codec_id != AV_CODEC_ID_XMA2) { packet_sequence_number = get_bits(gb, 4); skip_bits(gb, 2); @@ -1734,7 +1737,9 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s, } s->buf_bit_size = (avpkt->size - s->next_packet_start) << 3; - init_get_bits(gb, avpkt->data, s->buf_bit_size); + ret = init_get_bits8(gb, avpkt->data, (s->buf_bit_size)/8); + if (ret < 0) + return ret; skip_bits(gb, s->packet_offset); if (s->len_prefix && remaining_bits(s, gb) > s->log2_frame_size && (frame_size = show_bits(gb, s->log2_frame_size)) &&