From patchwork Thu Aug 12 04:50:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29478 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp410842iod; Wed, 11 Aug 2021 21:51:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDDe6dvCYWZJa0C9PPsVCOL36/2rsalEWV9Rv0+i+wqDEsgxOv1GK4sGqgZaky0Ol6Eyj7 X-Received: by 2002:a05:6402:2217:: with SMTP id cq23mr3178245edb.56.1628743886146; Wed, 11 Aug 2021 21:51:26 -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 um28si1215612ejb.255.2021.08.11.21.51.25; Wed, 11 Aug 2021 21:51:26 -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=ixLJn0UX; 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 D334F68A066; Thu, 12 Aug 2021 07:51:23 +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-am6eur05olkn2071.outbound.protection.outlook.com [40.92.91.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 227C168A066 for ; Thu, 12 Aug 2021 07:51:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e5bU4BSOKrHAMACA1r2GW+LFYJJMk2mjSe9wwH6tjYc4rex/5mpSoA4EddcFk2KEXOR/x02vzg92/el2QW8CLv5vqSuf7+iYoVuSDg9espMKIpLnuGTRIumJ6MpbrZjSB0YTip2Q14Fywko4vS6pd+eAGOMK+akz2ZApZUCjcuMAVAkkANTHF08vHPuRN8MEZQFsFsVJIcjELDHu7D8PUcKzDe2g2L14Pb24ZGnFHZGpysAEHqsMR8OF1+rDcFWq4QzhhywzgfJChmsODI5JTU0mv3A7/TZcxmR9agoO6udMVCk/8srAFccSp34VB6t0/jWprIH8u/Kd7VxTEHv3XA== 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=BH9WBA7XRdy2u8necftepIQpoxQYv2G4MgNQM+IVMlw=; b=OKf95YHL4EBmNSixkNUcrm9KbKVnjgfPwFlPJChm2jhMiMS/1dzeBGpDpE2XSNrqNa+MKK0mmwUDEjAh8AIQzDXmiSMOVoP549L1xf5n2Rs7qJ4YTN2KA9f2QhSA9CiJ1PiXxJ+/RLOoMmanTGp7sdogrVCQiJARX2xduPK5kEXnyq4/SeYNphs0hyqv1kEVqVZoke/k0CEHqM5yRDyBQxQu/vtKInT188lUOy8rvdDQVxzVNj6Z/e7qOAYydHb1ab49O6ndvLW/L63hnSIkezdCrBLO2srfOkP9ZFfxcXS/ndfUGfLy4fbFb59obhEd2OMNACub43Kr7Xwracq9Zw== 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=BH9WBA7XRdy2u8necftepIQpoxQYv2G4MgNQM+IVMlw=; b=ixLJn0UXFoQvPnwwca0v9c0UjY2VTgWTHZKE9aEipo5rM4pUJUMHE+6YwzogmnVVLwWtcnM2brNENvcJpdOsYhDvZJEYxRrT7lWFOzz7czStHZ3N12wSeoB714FT1ufdbZ/eyfGPa+xP0Av5//b0WAkf7zWhXcJe/W32XLx0QYNSMQ0mfknwRPa9BH/dCns/IwY3GPVCU9FTHF+PTpx6Ss/ds0FDsD+IlA/qzhS//fNm2kJ7WOZeP8qpVns7gi0PHg99aHxiMjB3GQh/Z8b6uwgDuz4l9zCGQb9bz/6JvArOFMk9aXqFcTkdgAp8ugPDTS82svIw/6B8haUMHju5Ig== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::40) by VI1EUR05HT198.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16; Thu, 12 Aug 2021 04:51:14 +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:51:14 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:616CE06310F034A35F0704E0B290E18A028710EF4238E4444319F880775CC659; UpperCasedChecksum:4C718AF49C62740E9E0CF14A54A67FF69313E6600AA65DFE0E2730953450EA3F; SizeAsReceived:7180; 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:51:14 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:50:56 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [VUX34ZqgbC9c41e9ZxNh0MMoomW47HQc] X-ClientProxiedBy: FR0P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::14) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045056.4758-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by FR0P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.7 via Frontend Transport; Thu, 12 Aug 2021 04:51:13 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c02daa46-9a50-4562-8e4a-08d95d4cd010 X-MS-TrafficTypeDiagnostic: VI1EUR05HT198: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YJs4LLJL1zYFeAGI2wF/yToPV/EgKoWbaUynlIGr/mpjJyK67Tjhz7M2D7kek6HGq9PGA9LfY1bhqLRF9W8h7ZjKQdCEk+j2aJm693RSv1QnnuE84ijmEiP8gO7lkclE4T6/FWRJwIHASBmPm9SCAb4M24+fQubct7JpieAZ4J5mcM0VpInCme7Re6EGDb1EFu9vIrvmUmJCvbSymOibtqqMpCAPtb3QcPM0wIJaVkzJZ3nlCEeCIggmvZ3ySEdbhZdyvNmz+uZgAQkSjCuJZdT6zBL1NdcC1POf1SxBlBWW1atZs4h9MmTehg9memefeQV7Cc9o6N74HI5mEficU7HnU0V5F+bA+yPreA72MCNL+GFLTww6TVf+gHzMyx+hp2QQe5vv1QMwdkbsU/zLhuPSNFkx4ep0yGeIVeR50ueZcsAHbtSk1VBOlxSIkZX3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WbrdHdxAYKMAa7pIQEYtpacADqXjhrDj4pQwHojtRrD4BWsq59VM3jRmGgy0uS8BThMupJKc2sW3kwRxtiaOQ21m/yrCSjx+DizEjv/hn0Zf0g+K7Qem6YZFZDs6PFpGj10LsdgXoF2IaX29yFAHVQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c02daa46-9a50-4562-8e4a-08d95d4cd010 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:51:14.2574 (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: VI1EUR05HT198 Subject: [FFmpeg-devel] [PATCH v1 03/10] return value check for init_get_bits in wmalosslessdec.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: +yd+dXdCtYRU --- libavcodec/wmalosslessdec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 74c91f4f7e..a2e83ca99c 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1187,6 +1187,7 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, const uint8_t* buf = avpkt->data; int buf_size = avpkt->size; int num_bits_prev_frame, packet_sequence_number, spliced_packet; + int ret; s->frame->nb_samples = 0; @@ -1205,7 +1206,9 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, 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; packet_sequence_number = get_bits(gb, 4); skip_bits(gb, 1); // Skip seekable_frame_in_packet, currently unused spliced_packet = get_bits1(gb); @@ -1256,7 +1259,9 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, int frame_size; s->buf_bit_size = (avpkt->size - s->next_packet_start) << 3; - init_get_bits(gb, avpkt->data, s->buf_bit_size); + 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 &&