From patchwork Tue Jun 12 00:45:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 9378 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp5783128jad; Tue, 12 Jun 2018 11:23:04 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK6ZulIjgLdj5rfzjPv8pF1f1gpHVfVCZCkPljk+MMC8evfy1y3p5SEE2vqawx7cAiZO9mE X-Received: by 2002:adf:f712:: with SMTP id r18-v6mr1390989wrp.85.1528827784218; Tue, 12 Jun 2018 11:23:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528827784; cv=none; d=google.com; s=arc-20160816; b=qRYMtxZF/04m8XnM+w4FH44TBK1bdlYseL22JLVMbU6CjzgGW9Hu9J7hsyBzxp1knu kaAgMi7b8UyuaLZwY0YQPTY+LXNjInaeIF6yV1ibCXDY3f5Hjw32vew5/0Z8T+hcVSE+ 6TV6GA1Da8qMTZJodsK+7+8jduDzLEG3TCl+adzWCstKaYa1Fo8PVQrJ9EDe+EW+k6sL id6E8LGYVOqqQEKPYEBGu1Vai6hyUvR+PiW0H7KTUazVGXrwmtP/nANAsqiPmtznt74o ac8HvUC6jUEH3jTUqpUc1QulUemlNVvUyeQvzRy7SH5ZAi21Xue+DP0KivgD8UwwlE8c BDEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:content-language :accept-language:message-id:date:thread-index:thread-topic:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=OFj2lH5E3J0/2m2Xf9sdGsdnR6NXXFAkTxvEzbtBugo=; b=NI464kLHXMYoXgzRqh7KCsNH3DIVsJgjjO6/ZVu515S0rKnmCCI9QeL5J7Vv5R/B/Z a7nYlCzQbhLSDxIhZI43IFH5IEb7t29jpSqDrCcXzhLomNlRIwunmL3n3gS12K9sW31D xOgXQXJDADp4/InoZIUpQeAdR515GPM5ozpvzzTk8rHoRgb2opJlkfa48HgpZRRHY+lw D3DhiGZl4wFmk58xwI2drtRWVEzMzB2ESSgR3gj/veu6pEfJvYJBjnuuq2cyLoS3PVO8 n2dYJH+O8C005WGaFaDsEfyPn5Vlt1TEsLe4yw5uTKcUa+2rhPwNSK53MNspgfOg5UPc NDIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=q7LSkZwb; 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=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q22-v6si759854wmf.13.2018.06.12.11.23.03; Tue, 12 Jun 2018 11:23:04 -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=@hotmail.com header.s=selector1 header.b=q7LSkZwb; 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=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1EC468B02D; Tue, 12 Jun 2018 21:21:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-oln040092253060.outbound.protection.outlook.com [40.92.253.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 849BF68ADB3 for ; Tue, 12 Jun 2018 03:44:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d2cgFvREkoE4jW9eJcYLcD2EE3ov3eEctIyB+64CH9A=; b=q7LSkZwbHfJtytmIAL6s/Qlf0rie1gaqq3zU65/CtomVvr1KdS1g9h/XqEZj/yAOKruS/8xvCxhj0rStERhfwjS89JmwxjkORtZTZjrk82kuK9fxBgKBM9RYVh4k0sBN9Mc2SEb2g+oocewhGmdl4iLUA7BtJEMpvEKpmx6G0yQGrRlSApbRtPJiZY26XCrHQygrmQDOO1hJHHQ6DxLxBYXM5OrX71zP8yBkx6kcLBxOq45Po+Op1D2GjBmXNqeUpmGjzwQiZuzg69osC3ijY/n6P5VdSRGU9eUUHtfExsqh93diR0zGp9I9GnGZa9XQ+64I6hG6xbKAr5Z6weyj0A== Received: from SG2APC01FT057.eop-APC01.prod.protection.outlook.com (10.152.250.56) by SG2APC01HT217.eop-APC01.prod.protection.outlook.com (10.152.251.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.863.11; Tue, 12 Jun 2018 00:45:00 +0000 Received: from SIXPR01MB0560.apcprd01.prod.exchangelabs.com (10.152.250.59) by SG2APC01FT057.mail.protection.outlook.com (10.152.251.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.863.11 via Frontend Transport; Tue, 12 Jun 2018 00:45:00 +0000 Received: from SIXPR01MB0560.apcprd01.prod.exchangelabs.com ([fe80::a40e:4f4b:9fc9:613e]) by SIXPR01MB0560.apcprd01.prod.exchangelabs.com ([fe80::a40e:4f4b:9fc9:613e%4]) with mapi id 15.20.0841.019; Tue, 12 Jun 2018 00:45:00 +0000 From: Xiao Yang To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] msvideo1_decode_init: check frame dimensions Thread-Index: AQHUAeaXJ6y+d3CqJEK1+vBbJUGWKA== Date: Tue, 12 Jun 2018 00:45:00 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0P153CA0037.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::25) To SIXPR01MB0560.apcprd01.prod.exchangelabs.com (2a01:111:e400:b417::17) x-incomingtopheadermarker: OriginalChecksum:F89EC0AD6F0FE4A6D17B3D922C02F03B028E810E9FD5F116A0B280DE8C2136B6; UpperCasedChecksum:D72829E005A34AAF580AC6B2BA71236226946D67BCFB15EED1624B20963F13C4; SizeAsReceived:7442; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [WOn5EXf58MwMpdXLjRWppATchobY9DyvrrV6Qn1H6gw=] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SG2APC01HT217; 7:McRKtM1+ttO1RJ/MIqn+FGwyRA2plHi6i+mTeMw4iCV8w4nA/ErVf0UjKSTkihMCZLM5rhzRlC5J5gNPCqbEF0AGBQy67zuhBMASDyToPoljwfttq31G6FqIOtXdF3ZEwKEyd0zjHQodOkYuhUblp07++zZbG6+dwo5Rt+uP6LDCvDKBFG3cuKeEjgw5MTN+piHNhIGNU/V0kyBD5nVWTx9QV59KUKqlJ+pUP+fQyq6KCLjBgzqBsdGa/Oj6/Oij x-incomingheadercount: 48 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(201702181274)(2017031322404)(1603101448)(1601125500)(1701031045); SRVR:SG2APC01HT217; x-ms-exchange-slblob-mailprops: Zv/SX2iM+5UbC+vOurIhzqSElp5ePAXqGnGM/IbyA1mZ+WxKBlzRUSktaimEtDYGlK/AIBUApU+YETN+RNJhq8uVDmjFm9vw+ogcoJIHD/mRtDxBBEHT5E/ICO4deqK0vEGHKxWcbX1A4Aa5zSTl/iqZvvIno2sjc2YNIB1tHLJKjEzUA0WKtNFypg08pITwsuXZgu6wTdEFgL/how9L7vnz1uQorXR76rgcveF5ZxGC1UczPfPKup4iXfKdOGVKXhjclyeM3ogwf7dBjuqFDAqc9NcTOq/DHqaFXxM2iufqpLkItZ321IHgRWz1foJFASzHbSw/ZIsOUtPmlCZKQtJwN+2y7oFzgDvKeamq24M87fJ3hodGC15Pv97x3QasJ1RL0ZyTDDYXwJliw9iTuH0i6lQg7A3jKEoGCRg1QKR5oQGVPy5EGKCLZBWvL/v5DD9hgWjtCbCtDqgtauI8HGLeWr+ZV9ZQKEgEW+39+eOCoJoaORsJH6650LFx9FqTbfwy0zGTrLJa+R4kPJxJQs9PcwcKciUMpO3ciqrRrWu8VhOL8XaKfQFaNkDiOOGD7d1t9cidvi2uhQlupL1scZvQyu1mdvqCII7LXMIWjxvZqniOnuI+fS6aLJJtq49gzMbrpJn1fgk5wYgTc2ZfIsDgpa6NoVQIHMtOturKma35Xn7T4KMT3OdcUmXg74rdrIjyUKxdrjs= x-ms-traffictypediagnostic: SG2APC01HT217: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:SG2APC01HT217; BCL:0; PCL:0; RULEID:; SRVR:SG2APC01HT217; x-forefront-prvs: 07013D7479 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(189003)(199004)(54906003)(20460500001)(86362001)(104016004)(33656002)(39060400002)(81156014)(83332001)(105586002)(9686003)(68736007)(2351001)(87572001)(5640700003)(97736004)(72206003)(6436002)(15760500003)(99286004)(74316002)(55016002)(14454004)(305945005)(2900100001)(1857600001)(82202002)(2501003)(5250100002)(6346003)(73972006)(26005)(8936002)(386003)(6506007)(3660700001)(476003)(8676002)(6916009)(3280700002)(106356001)(5660300001)(486006)(7696005)(25786009)(102836004)(4326008)(15852004); DIR:OUT; SFP:1901; SCL:1; SRVR:SG2APC01HT217; H:SIXPR01MB0560.apcprd01.prod.exchangelabs.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:; received-spf: None (protection.outlook.com: hotmail.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=YangX92@hotmail.com; x-microsoft-antispam-message-info: Hpvwb/DVaHMdAajkSIjrjqzZhgQLUIObr9+EWJ3gs0SVsJEXrbWj4SRkR37X6Bc7j1+d1vrlBdz+VMzSrBeCQXXrr2STpghf/PLoz+odh4qSRjPq2O3HyCMIFhuJ8LNAFVZbNKrJdULoM9nm1R6c6tiDuUB1yc2gp7mpKMg7R7xHldIDh3JIHN/33Mdh764R MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 175557f0-c2fa-42c3-40b8-08d5cffdb9df X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-Network-Message-Id: 175557f0-c2fa-42c3-40b8-08d5cffdb9df X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jun 2018 00:45:00.2030 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2APC01HT217 X-Mailman-Approved-At: Tue, 12 Jun 2018 21:21:49 +0300 Subject: [FFmpeg-devel] [PATCH] msvideo1_decode_init: check frame dimensions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Xiao Yang , "libav-stable@libav.org" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/msvideo1.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index 29700f5..04c5ebb 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -73,6 +73,13 @@ static av_cold int msvideo1_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_RGB555; } + if (!avctx->width || !avctx->height || + (avctx->width & 1) || (avctx->height & 1)) { + av_log(avctx, AV_LOG_ERROR, "Invalid video dimensions: %dx%d\n", + avctx->width, avctx->height); + return AVERROR(EINVAL); + } + s->frame = av_frame_alloc(); if (!s->frame) return AVERROR(ENOMEM);