From patchwork Thu Aug 12 04:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29476 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp411295iod; Wed, 11 Aug 2021 21:52:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4FEh+/DQhBnIGcO7lrq8y6gfE+tB4x1pb+24qxojrTRFxdHeVEsL0GQvWRdhj31HfkXqL X-Received: by 2002:aa7:c805:: with SMTP id a5mr3143183edt.23.1628743946209; Wed, 11 Aug 2021 21:52: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 o2si1376808ejy.80.2021.08.11.21.52.25; Wed, 11 Aug 2021 21:52: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=n0xTz2RR; 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 F10DB68A33F; Thu, 12 Aug 2021 07:52: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-am6eur05olkn2097.outbound.protection.outlook.com [40.92.91.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9322A688181 for ; Thu, 12 Aug 2021 07:52:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lCSULo08XKjvUxwYhJRrp3w/E7WlXye232lkrbVAtgFkDzVWFQZgnVQOwaOr9iuJ7rMju29sHnqC8B2PTLSAfVpwPJ6n1FLZkYm+SmKcWqpGJGXHvAneL5pLsWdWo2ygJRu0pBrSL9+4I2zninC+wbOq8Lx6hcuTNm/bU/kApDC0BVzxyZ5aFt7HfGjU6L60+PdREmU1t8oS54WY+titrbNA4qmMUg2K6jfm7tJW7krTm1MPBRwwR/QHf8d6NiHRSWO4CRT1Fl/nDL+xUUor8IzxebUMyzNncFQ7cFB70rYgSdA7y70XdJjMssneEa+9UckvZLy9qh2YbueqWAgQ2g== 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=k+nxAFjIbjVfgBfmytx0ItH4glXaqo3AbxvbjimG5To=; b=Kxe/RB9dZqw8ckmnsORpEE9hRp8xoNqwy0IX0vZk7KR4Fpx236H/V4Bm9iLpSl3r8lZgraQupRYh8WbITtOSnX/WBAzW30L/VWt6gOapk9vq7pDA8a8FUDvw7Qszl+flIkPQjExpkhDhrEiU1QfcdPnWYJsQn8IVlWs7Re4shXijGbWtRq4U7V0MTXb6JkM9KVy9HW4Y3GvRL/IE76Aim1yPVPsK9xAxYb8gYxTlzUzFl2PwXNmucsDlMbnVCE8Crbt/gG5TwXcRa2YXgQ8Uebo8/w/wgx9EpOVlGkG/CRprmHx0jucd5hQiqJ+DBRA7MvBzdl7ydFLJ2fL1Vv6Ijw== 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=k+nxAFjIbjVfgBfmytx0ItH4glXaqo3AbxvbjimG5To=; b=n0xTz2RR0uIOGBAg+TpA9s9ZwmcLUPk/KnQ8dOLkfL6A1lE7nAjkxlAZw0HSgLe5itL7EcmIVMTxEkbJ4tA0DPJvtCUDoH9lr+eprOrpcDuz9ihCXxw/qPyUkY6Xr4oZpWbrgCrVczqqWVaR/jX3ONeHJFDLF9SwSxhoG2vLA6fjdVwFFvYWG4xBe5uVoLR9Dbz28KZXTLcNeh0TNBiQ8+Mj5Bllv911HZ1uPI2h+z0DEIJZOMLN47sPkc1H6P4xyY/K1xMjvxUkIVRJO65o15NOrDnKxm8KpIUAT8yfmhkYXtJaN0Rwh36ys7hEE87N8JMrXQhTvEpa55sTIMIjKA== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::4e) by VI1EUR05HT123.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::466) 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:52:16 +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:52:16 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:067D0F5156AEA807D5CE21053361CEEC813AF2364AB6C6283F5699CB5D62BE63; UpperCasedChecksum:6E9A123E749D6BEA4B4CF21A2FC677877441FA407E96066F4ACCB115688465F6; SizeAsReceived:7179; 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:52:16 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:52:03 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [t+HfRMaKbd8nCiVsHTS8ByY6RkJvJy6f] X-ClientProxiedBy: AM0PR02CA0152.eurprd02.prod.outlook.com (2603:10a6:20b:28d::19) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045203.4812-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM0PR02CA0152.eurprd02.prod.outlook.com (2603:10a6:20b:28d::19) 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:52:15 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3887d805-9655-40eb-5157-08d95d4cf50d X-MS-TrafficTypeDiagnostic: VI1EUR05HT123: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: II0pkJ0Jxmrbfl1moQAjtRP3/eSn+FR04zenE5hTTKVIAbldL5kMtd44+DjFKt4FBlEV8RcqwN7l1zimmNKBWMAtoFua5Ay+bjdJKIeiYgrHl17slaLS7yH0Au3hlOhOwFyA8zNY+zJxgSPxhTxT1579wo7P+zFnqOzwQ3mCU9v04AvtEizGBmIxiBuUm0VFEwMcHrmL38ba5bAE7cvc0QC3zMNuAGHzkfu9woLJmIgxNNo/NmZLQ2AesHAK1g0+XGVZY4AULEj0tgRY213DGNUwD1x0Z/8nsUDbOBlEXQpLmsxrzj3DUCjT9C9qhxfvZV+BInAYmSvVhaEeC1yfz/PSyJR0EZGbszP8sFDRImVjvBZmzHdHAgt/81pNdPy7Ssa5tk2WAZ3VaYWEK0VElQtYlxkSFBR44ftDcWbypx+4HcsyZ4Qs4jZDxq0M4KPI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S1wjvJUXuuHSeU771+iTWnq26gD+XzbKJjlW8fp8S6zaHGzo6vjOfh0l6EbvvKPGSvgRWP8DjICBqg0+9ylSn/9/chDv7st7yermgwiYrYxlKDJIqsLw+BdtkZLrQY4+r35JUzp2NZGQooRCm4sdIA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3887d805-9655-40eb-5157-08d95d4cf50d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:52:16.2930 (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: VI1EUR05HT123 Subject: [FFmpeg-devel] [PATCH v1 04/10] return value check for init_get_bits in wmadec.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: FBNSLIkecgWr --- libavcodec/wmadec.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index d627bbe50e..6ac6221d11 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -822,6 +822,7 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, uint8_t *q; float **samples; int samples_offset; + int ret; ff_tlog(avctx, "***decode_superframe:\n"); @@ -838,7 +839,9 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, if (avctx->block_align) buf_size = avctx->block_align; - init_get_bits(&s->gb, buf, buf_size * 8); + ret = init_get_bits8(&s->gb, buf, buf_size); + if (ret < 0) + return ret; if (s->use_bit_reservoir) { /* read super frame header */ @@ -904,8 +907,10 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, memset(q, 0, AV_INPUT_BUFFER_PADDING_SIZE); /* XXX: bit_offset bits into last frame */ - init_get_bits(&s->gb, s->last_superframe, - s->last_superframe_len * 8 + bit_offset); + ret = init_get_bits8(&s->gb, s->last_superframe, + (s->last_superframe_len * 8 + bit_offset)/8); + if (ret < 0) + return ret; /* skip unused bits */ if (s->last_bitoffset > 0) skip_bits(&s->gb, s->last_bitoffset); @@ -921,7 +926,9 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, pos = bit_offset + 4 + 4 + s->byte_offset_bits + 3; if (pos >= MAX_CODED_SUPERFRAME_SIZE * 8 || pos > buf_size * 8) return AVERROR_INVALIDDATA; - init_get_bits(&s->gb, buf + (pos >> 3), (buf_size - (pos >> 3)) * 8); + int ret = init_get_bits8(&s->gb, buf + (pos >> 3), (buf_size - (pos >> 3))); + if (ret < 0) + return ret; len = pos & 7; if (len > 0) skip_bits(&s->gb, len);