From patchwork Mon Jun 11 06:49:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 9370 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp4652973jad; Mon, 11 Jun 2018 14:51:34 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLj8MomtMV6X4EMiHcRMZwkHoHe8nizyEtvGrcm0W3m2yZO9NxvvqbDu4jsBF5Vk7wvW+1R X-Received: by 2002:a1c:7eca:: with SMTP id z193-v6mr381625wmc.139.1528753894612; Mon, 11 Jun 2018 14:51:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528753894; cv=none; d=google.com; s=arc-20160816; b=mu5dJteXNXnUaMgnCqEL5TdeArstFruwpG7mNlsv6mJ9ZLySyADJRuYAxyb6pkiPEV VCnesys4JiQdyK43g82eneSWa+yHaak0N6y5rrhwl+jRQzQND4bLfdf6bx1dAetj0av3 DDvN6rEotE/da6ZbkMWb5xYPxETE9GLTG1KhhE7Y9+7FKP1kPwpPRIysZgjeN53AAOUl vhKJnjOBmS2Q/0wL3TFGs+Xa9nC3kpLdeiQaEnNIkSwYQtWmDoCfgrz0jHQYG4PDS+4+ YuXkNnXVNfg2lAkbMQg5heyHi9cB7pElISkw+S3PmqNLQTf2bBYF5cCE2Jo2LfkqB8iT 0xkA== 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=8mqpCOtxC1tpthzy9Qeak6Rb9GpbUYqZCccPufe3f4k=; b=vfKYk/mFoJ3Ke9SuHQ6QH1xHj+xzxxNgtj16i+UZQV46HXGjmLjLgpr+fuhclCCAKe KcM2y01ajIRSA9JgYYrt9Irhkevce/zfhVESk1AzoGLxF7Ujgqr1F3PVsCA7XfAsIxql FrwCHgry0/oYoNnf5jzUnL8OEQPM9Ko0USzR/fA621mL23xQWZR/lgsIPUeTC4iNm6UF uL8BUg1L7kD5sREdBOIIyx/kTkDG2GFl/cyVe3ZNEtEjUBVYlDTFJINYri/EU4UximLb IKA2NZmERnfY1Pq76VN273GmMUaa002fNP8w5BZQCpYRZ6qMEeT93kdawUT0D49CXC7J gT7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=Xx9t2oMk; 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 k126-v6si6644606wmb.153.2018.06.11.14.51.34; Mon, 11 Jun 2018 14:51:34 -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=Xx9t2oMk; 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 93CFD68ADC6; Tue, 12 Jun 2018 00:50:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-oln040092254098.outbound.protection.outlook.com [40.92.254.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82EFA68AB9E for ; Mon, 11 Jun 2018 09:49:09 +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=QKSr4ZkoyED1myk13kZHtCf9a8zw7ijFbWKjklzGQxM=; b=Xx9t2oMkdsQCaXT6vFwMagSb3yh2WKWTgJacWynpH2ukLpXmJ31rj5xvztgFsdoz2rB3Evl7yyKY+wY2ceWTTiIoaMkngijLH0/ifvJwV21T6IfpEsEqx3NAHpVCi9p4a2Wuxg6xMyuB6ijvb7VMPW1dM0ALnWLdfZTl85Jcs6gPF2/y07KrS6m86/pvfpvUNSx+RhpYrBdkWbm8yP0aDqF2h7VZUO5dPyXQuxD78QW+OgmiXkRA2q2nzJeiLNt4IPPVKbrKe1dMQnbnxkL439cLTkk9N4QhSStFv8VaLyVMYlX/evhK3lQZbxh2y7STLnBIgalkU9gv7kTviBZHyA== Received: from SG2APC01FT044.eop-APC01.prod.protection.outlook.com (10.152.250.57) by SG2APC01HT183.eop-APC01.prod.protection.outlook.com (10.152.251.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.841.10; Mon, 11 Jun 2018 06:49:53 +0000 Received: from SIXPR01MB0560.apcprd01.prod.exchangelabs.com (10.152.250.57) by SG2APC01FT044.mail.protection.outlook.com (10.152.250.239) 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; Mon, 11 Jun 2018 06:49:53 +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; Mon, 11 Jun 2018 06:49:53 +0000 From: Xiao Yang To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] smc: check for frame dimensions Thread-Index: AQHUAVBmsIslOOUwC0+8GUuTRRHvew== Date: Mon, 11 Jun 2018 06:49:53 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR0401CA0003.apcprd04.prod.outlook.com (2603:1096:202:2::13) To SIXPR01MB0560.apcprd01.prod.exchangelabs.com (2a01:111:e400:b417::17) x-incomingtopheadermarker: OriginalChecksum:CA5DDE30ABE83A21249FF46289418287EBF12A449CC641E987AA54E53360F98A; UpperCasedChecksum:7136D541607E77B1A545C3502CDECFAC39E056BD50641895C97E6F60595C06E2; SizeAsReceived:7426; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [DzEYOlI8miYzqGWOWQR+jAQ6/Q3Xly2RbL8CChkWDYo=] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SG2APC01HT183; 7:KobAdPbgdmHK7C9c9NWZXR4JgJab2XGUMG/FW9GMBd/0PuNBfmGsu0lty8a66sjtVPhEFxaffiNw7sdgQtz+Wlp2Y/kBvq+cFWm+uuo47lHxAQbkas05tuXpOWlnLNVTcNGtMpl7xxV5njHfVYIH5hyY0NyqCEgA2zZyR5ePlpXrnZsM/bQt62FQFHyKEv9IHoW2Kg5L1+qSqcjcs4vgpaU6TCprWrxKMj6c1CGgqJM8bytcKbZiMmNMW7D+GWtV 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:SG2APC01HT183; x-ms-exchange-slblob-mailprops: VlsgVBy4cKVeJc1XHod/wRDPdKIpc/6F18ISUbgMATGy6Wm9IlkWQsKYO79D/OOr+P/AVdrzGW8hF/6hc4JQDqzsUHkSvCgAqhlGoqevmKtFv36KFDnomIiuWZo0Kgb1ztuAyCparOYFCUG2PCZ0gzA/t26IaZfNHPX2rnWqepazgUqIPaL8kGhHM543LQQ+P0ie4tJgWIVaYWc1Hq1Fb8R8lbHHmbwWIHYanI+Hoaki05nL3bL8+SXOv51M+bAeJAUdTBi+OcfEEc4dgK1Mhv7gMnxTsf772SRXhwHI5gwTWK32UZotLQ59MQuBnpSGlI+LOFR3EpAByJjEndIkIxiEBwzIMLei0sAi0pCyf4wfPZSHUlEwrQ7plrgC4ydWdY7LKFMUtBxyN2IpZ4FeJxVVDq9B1kVSVVU+RDszYc+YnxGMHVFESIwvuFoa8BTRe0SDRSbnvGxJzuQzHHj49LF/9xnIzM3cluEsdWLIAWq+Sd8M4ypwQiYvFR5nBFAbTGPSK4hLY34HApC7hdqD4gVsmDWo+9gHQqHLDLefjIk0qy77I0GdJD6/O90707h2AMhPy8zvkIQZPcO2PqNW8FWnlk/LQKNGrHelM1sho6aGLNjD6uwv2ymI8vVzeAXDS+HNG/3RHfI= x-ms-traffictypediagnostic: SG2APC01HT183: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:SG2APC01HT183; BCL:0; PCL:0; RULEID:; SRVR:SG2APC01HT183; x-forefront-prvs: 070092A9D3 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(199004)(189003)(86362001)(106356001)(97736004)(82202002)(104016004)(54906003)(68736007)(9686003)(2351001)(73972006)(14454004)(20460500001)(81156014)(6346003)(4326008)(39060400002)(2900100001)(8676002)(102836004)(6916009)(8936002)(6436002)(105586002)(305945005)(6506007)(386003)(5640700003)(5660300001)(72206003)(486006)(33656002)(99286004)(3660700001)(5250100002)(74316002)(7696005)(55016002)(25786009)(26005)(1857600001)(3280700002)(83332001)(2501003)(476003)(87572001)(15852004); DIR:OUT; SFP:1901; SCL:1; SRVR:SG2APC01HT183; H:SIXPR01MB0560.apcprd01.prod.exchangelabs.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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: 3sHaMDPIuMh9g0/w6eYLOyGrrTjNi73GXL/ZWP8XUafw0a20LN8YHx4nVXuSUHfJbjk0flWjud66v7if8LcRhVpD7vYu6ikkugu/mH5YKczra6ceOuUqK0/+4RwAjCIQTZZyPlaeLffDA3PbATP+ZJvSQUeCKtP/Uqk8Au2vvzhTcZLd7HCab/91+y0ONk+u MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c9db9eb7-3420-4ce9-ab63-08d5cf678920 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-Network-Message-Id: c9db9eb7-3420-4ce9-ab63-08d5cf678920 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jun 2018 06:49:53.7047 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2APC01HT183 X-Mailman-Approved-At: Tue, 12 Jun 2018 00:50:42 +0300 Subject: [FFmpeg-devel] [PATCH] smc: check for 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/smc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 3cb4834..fc1d308 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -421,6 +421,13 @@ static av_cold int smc_decode_init(AVCodecContext *avctx) s->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_PAL8; + 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);