From patchwork Tue Jun 12 00:27:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 9376 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp5782831jad; Tue, 12 Jun 2018 11:22:45 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIKOHbt3cKnqfisjEPWvMotKrYgGlTdL8OeN3dhVd979CE8ss3cqMkrY8G9fsd7TkRPouX1 X-Received: by 2002:a1c:dcd4:: with SMTP id t203-v6mr1032619wmg.156.1528827765703; Tue, 12 Jun 2018 11:22:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528827765; cv=none; d=google.com; s=arc-20160816; b=xapydRPggWRXqhNZ3kbBSRAGUZTPPMxReMhzdAw8kEvjl7RWtR2bdIH7tDxHcjEnI0 seDeT0yrCdExHFxkWApjq/hF6QbNreSbkEtD3Nb7gMJpUSkoHz84MxQfeWu7ovjqeA0c s+uMX07hkg/WYVDcQOgD1IQmSa89BSWd4WyYyuf4zaAIOPKL8e2cdamaeaBP46B+ZaWo cGTjsw1cKgtDUShZY8eWKNILDr6Q3sumiCIuVRmc6nBqIPa14d3nHtLp6G68Wfz/C08b 77RKE5iSNIgm9nkDIWcPE6+KmHt6UYwBiZbGxVzFp/T9DqB/lrynpXR/PbNPI5Fponnw 8fNw== 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=Ah5TT5fkwt60hj5qIMdxRTOB7HT6Cw/F6Dn2UCXBWU8=; b=EghphdZ+TXORGTE1XCoR4NIBtrOj+RfdgpU/jOf++KnY5Pe35rDQIg/cZkC7nh1x+T Az4QpsCUFn9/CjxJ/oX9wU7S4OfWpgvDSoPm2++NVf32zFtkPJUJEsfGHTZF+7XsRpaF qY2OqqUu0VYpQb9J069bEIdPEx9gCkN8763tnSY/H1Fzgonu6M6HsAlUOJ/Nhj4Ou//v k6Z78wbM9R0+sdO25UXc53C/RT/36mZrUQ45b69mV+WqwK7eWfSazjec4OAVFM+OJPWY ucjrXMTxxVkJVLxggAZ/jN/ND3cBBZXTRHjzkKFxMKW9Pc3m7ClErFQJeHqkhgGwAH5o 1g/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b="Dxk/nB/9"; 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 m89-v6si733225wmi.181.2018.06.12.11.22.45; Tue, 12 Jun 2018 11:22:45 -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="Dxk/nB/9"; 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 9E24968AF9A; Tue, 12 Jun 2018 21:21:44 +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-oln040092253079.outbound.protection.outlook.com [40.92.253.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFDF268AD1D for ; Tue, 12 Jun 2018 03:26:34 +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=qn2feqa/bd7kY3vCtdbxESAxsUrBWrjolbKCviZlN9Q=; b=Dxk/nB/9NuS7vMHXr59A5oKwbjB+dgxc2y6UG9N3sgdUt50u2lSyAdEWdEDkHKW9kDdPsynM021MT4S5v+9ldYAlalnmUz3d/E9UyFNBOiZYqK6KztPyjTwi/QBBxh7m/NKuW6xlc+t95F4KI7ZxjSNrulWAR1ireDqAC9J2l+fkpegwIKmnsYHV1pmnGKJPaIEi4bUlBTd2UyuMOqjsaeCTt331G3rVscI1ZzsbhJfHVrL/mKyVliSvQnkvRr1KVDeVS7C9Cpty+tIVRoEK/ZocDtjq2/dyURwqzxIFmJzrH9odBU6R4vCG2r5xu3rzBzipiWNLa08A09cVaonmkQ== Received: from PU1APC01FT061.eop-APC01.prod.protection.outlook.com (10.152.252.60) by PU1APC01HT136.eop-APC01.prod.protection.outlook.com (10.152.253.239) 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:27:21 +0000 Received: from SIXPR01MB0560.apcprd01.prod.exchangelabs.com (10.152.252.57) by PU1APC01FT061.mail.protection.outlook.com (10.152.253.24) 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:27:21 +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:27:21 +0000 From: Xiao Yang To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] msrle_decode_init: check frame dimensions Thread-Index: AQHUAeQgAnHm5pkmmkmK1IyM9LAbjQ== Date: Tue, 12 Jun 2018 00:27:20 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0P153CA0028.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::16) To SIXPR01MB0560.apcprd01.prod.exchangelabs.com (2a01:111:e400:b417::17) x-incomingtopheadermarker: OriginalChecksum:19EE810CE3E46A61AF00E1CD0A002720D41657771D688A50B5E89F225102B93E; UpperCasedChecksum:6946EA4B5D53E8D23C5E167BBED5155B8F8F022F6078149434B080F55719861F; SizeAsReceived:7441; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [/SF7C9sPb9Ul/AQq9kEtcMl9WD3aKTSxACUyrqoCRGw=] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; PU1APC01HT136; 7:r5sZCWX3kRP+jlPJXdI2pPhnzv5OnWwZucJ9bJLHjbg4uH8HB2ACR1zagMejwkGzyKCWFLV6CDHHN7Fm6esXoPu58/4+zgbuKWRLGfWaLnACk8I7w5w79LwcNAxPJ5BJGgXSbTJhK8H7KIS0oVSXAqZyAbK6kpxPM80Jj8rEpnJn2PUwwrHr03zW3Z7ooWdep64Oyxf6ytbCyZUw370Wp82OqclHzC267q6WX6kBXXQyslg62Hj0QB+uKK5l2UHV 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:PU1APC01HT136; x-ms-exchange-slblob-mailprops: Zv/SX2iM+5UbC+vOurIhzqSElp5ePAXqGeGZ8WBuO1KhCkUMbWcQU219BVXmDIaoiaoaUCTSKekOuT/KGMrBN3MPOVE5z94kxyA3LBkydTpw+aHyseQ7Tjjb3xYq8DMOVUF/umyHGxlCaOnicuFX0qHSFm/V5cu2hJuzZmiRjW1chsDevZwgFl9xN/Qszp6v1Lx3ewa9xPbAqM0NzXmIEsIpMWH4+LKEterrs2Uf9CvPpauXInIMVIgV80SPXSFj1FzG20rB2R+FMGsxg1Y6zZ3EkBdXzQjZtEN62/NW6PnI+UCl+AWhrWYMVzNQnozOzAhljxJFOMwMTzUYtoi9pPD4MvLq5Vtjs7ALhrmTH1Z7kEtxKfkxgTQlSoC5ec9luWl3xURiWUjqBgPC7rGhh8Esm+Ze5nA9moQvBx/hmONVh5mBWVGVwxIGrgZaFSormGeM1Z6nCs5dBBw5PAP4O122qYQYWXs9dYogDT+6hXeWOZwhRaNerNOT2D2VVOROjvA4lfpuqz1wpKLqKgddZCMKzcxPtc8a1sq5B4wG1r6gV4Sn2m88x6rVcWg+tt89qdKyOfqGnrUK9S+8PpaBZjKKF35KmaLrZKrmJtlKhNaUfkbFgZ7HMGjGbvW73w+yN4fLo/RVsSCRoAubG0i00dAh++oEN9LM3brPOTHtzG54s1Kbr1lPzFG7BVcS1ksvehwIVQVzExw= x-ms-traffictypediagnostic: PU1APC01HT136: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:PU1APC01HT136; BCL:0; PCL:0; RULEID:; SRVR:PU1APC01HT136; x-forefront-prvs: 07013D7479 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(189003)(199004)(68736007)(14454004)(83332001)(3280700002)(82202002)(74316002)(5660300001)(106356001)(105586002)(2351001)(99286004)(8676002)(305945005)(72206003)(33656002)(81156014)(54906003)(8936002)(86362001)(3660700001)(104016004)(97736004)(4326008)(55016002)(6506007)(386003)(6436002)(73972006)(20460500001)(25786009)(5640700003)(39060400002)(87572001)(2900100001)(6916009)(7696005)(9686003)(5250100002)(102836004)(6346003)(26005)(1857600001)(476003)(486006)(2501003)(15852004); DIR:OUT; SFP:1901; SCL:1; SRVR:PU1APC01HT136; 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: AJ0IiM0trOSZi723OR93HM5n8n2O8we4Tgr9cUvrW0qz0tEK00ezjmxM2HKhIvOOaZR4UGT4t6kbabybcN2pPLdFyGLxpzOtWgpIzz5/uP6Kn8Q7576jElDsscLjqw3TkfiOlg+6WqjgBgLVxBjhaaLqcNCqCjZBneYih1w+GFiBwMvJCmtnl9QDAnPDaR5u MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e62bad15-7acd-432d-0117-08d5cffb42aa X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-Network-Message-Id: e62bad15-7acd-432d-0117-08d5cffb42aa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jun 2018 00:27:20.9955 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT136 X-Mailman-Approved-At: Tue, 12 Jun 2018 21:21:43 +0300 Subject: [FFmpeg-devel] [PATCH] msrle_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/msrle.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index adb55b1..cd952a8 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -71,6 +71,13 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } + 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);