From patchwork Tue Jun 12 00:24:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 9377 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp5782520jad; Tue, 12 Jun 2018 11:22:27 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLK3ZzPhL2jA/riG069BWuAml4RX214aFJ8cPvsJgnxdmGguX5cj+TDzOLfjH/cisLATrnB X-Received: by 2002:adf:f712:: with SMTP id r18-v6mr1388632wrp.85.1528827747725; Tue, 12 Jun 2018 11:22:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528827747; cv=none; d=google.com; s=arc-20160816; b=Eldb8CNCKJc+ygqJjC/XehQBpnG/5Xb991QuZi/2fCdnGfldvTj/lcwjb34e/LahhO /n699MUda5X4wbd57j2HUURYQYWwVeLfqY8LvPIeQf4s89/IPZyTE2AD6XqrumyHHHup ex6D9kBWxwYDbU7aNkPRXsqo4ZdKPxR34dyKSi6WTZ6KFyQuYhFu8QUSwbIp3fiwDsOQ /G8Hq6tzrvcrHt1LZqRhnV87i98umucw7hJKfoYQ5IPsJmWixguqUaIg5fpTGwpH0u/L oJ1RGgInTpaXlH9+Jn5N/G0YPBa35IzUOCOErptf53ATHbyK7r629mnMvrX8p53xfkeT h1JA== 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=21rF51Ic8nPYGgH2SCsQVlaoaNatgW4FNKPyvjlL5WA=; b=IiSImNRdJNd9Eg9hQWgPs4xwQm3sQnp29P4BNpWH0eRiMClspeYrj4Vxtk2Xqha9fe SzUcSyGia2dSkesPTK+9nUouxqE8hn1SzSKcufyuhzyuLGOmkSZKH33s8RPmGub0wnJ5 DVV/KuQC86DJp0+wrdBRCDpz5+ZjUXtI9g0p6dQfoDn74k7ewuxuxdIYlSZfLBxI1BWT PR9PzczzVj1d4bcfTgvYXc4xHFaZczu0kx43YYexmtk3jufZ3zNFtc4MwOEvA2nHTnCu 459B1r8yAC6xXezb/MmbjDzzMIB0mK4mBki2wwBBdMuFQa6h2hUusUWTHU2a0K+M6l/0 qorg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=LdP4ZETn; 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 s62-v6si713054wmf.190.2018.06.12.11.22.27; Tue, 12 Jun 2018 11:22:27 -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=LdP4ZETn; 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 62BB768ADEB; Tue, 12 Jun 2018 21:21:36 +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-oln040092254063.outbound.protection.outlook.com [40.92.254.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F09CB68ADEB for ; Tue, 12 Jun 2018 03:23:29 +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=nxceWyi89sbmnYn8tAUucM9qnayyAtqfiABExW7b5xc=; b=LdP4ZETndIStNG0Y7EqQ8pzFZNNxnlJuIPBZxpXZF1wDPA1ogpup8TkQWNhoKm7nzrNoPThR2DZsFa32HbWKPeD4SkiQmblJxa6tzj5ZF+JLdTUcLn69stTIRSOFlz9KYzwA6tbnlWH78wQy/9qmkO5ynSKh28mg4gRZC0n5EE1M+9UD6T7B0PdwO6FkSplHGlsallTzFrRSd38QkvIkPyWIU0mq0/CHgC+snrEgVWKuxnpqaiT+eMuFeEm71YRjyOMnscVYUK/DKFo0u8lLWUCrCUdUfzu65gnUUydjawIz1fv7K3uBDLzHLKLK1WWXvdUZfpLnXpmGcQIk2F8hQw== Received: from PU1APC01FT061.eop-APC01.prod.protection.outlook.com (10.152.252.51) by PU1APC01HT021.eop-APC01.prod.protection.outlook.com (10.152.253.8) 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:24:15 +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:24:15 +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:24:15 +0000 From: Xiao Yang To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] qtrle_decode_init: check frame dimensions Thread-Index: AQHUAeOxnAfYrTafp0WOVZVpyhTX2g== Date: Tue, 12 Jun 2018 00:24:15 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0P153CA0018.APCP153.PROD.OUTLOOK.COM (2603:1096:203:18::30) To SIXPR01MB0560.apcprd01.prod.exchangelabs.com (2a01:111:e400:b417::17) x-incomingtopheadermarker: OriginalChecksum:7B041C9F9C8CE9487FE4C14FBF0F513B86E24223D99D1A70C9B31CC4F86D9B09; UpperCasedChecksum:A944AFC0B24AED90E8A60E8FBEA070DEC9131E61C0F4422D72C6A143F8FC98F9; SizeAsReceived:7448; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [44HCMa6SxXxqfB5V9jUhJkCz3OP/nhq3IC4ePG4KOPw=] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; PU1APC01HT021; 7:cUz2CcCVtvzESoDunD2/YRFlZBHkeAeNW5l7gcvYvxzqh65aq+KqOJibA1opD3R7E4iX9zjktKgxJYc/7TlfM3CpoXMdN5BEAr304pwgyqRi3VpJFR+7e3yCXWXwrIykTHreXXu4Npr6gut/yQqK5piEIJ3JubBfBZuXmnZ9HclBYzGH8dKR+i1kplpCOYbTTOsFQkL2Z1d9LQf9fPFJkgO7Q2/QpbgHLvpzq0GHLoPdvsr3q7gqbMiWPn91DRlQ 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:PU1APC01HT021; x-ms-exchange-slblob-mailprops: Zv/SX2iM+5UbC+vOurIhzqSElp5ePAXqGeGZ8WBuO1KhCkUMbWcQU219BVXmDIaoiaoaUCTSKekOuT/KGMrBN5wTUT70OwepScM9zGAJ3+Vzt2XPNqphXBAijf3N6ikiGrlc4oxSsvAulAMLISxubDquqiGNinMSCqs9NgYp5pUAafkryYxlotII0Fm1iSKZTETeOVzoEdfMx5bku8CkIQeD7w2Sj/DYLuCvb5kwtnuTlwNrrqj7a57fOks1gL8inzETrBi4HTeEiqaHBkrvLg+tow25LsiIhef22mJGJ2NSEBJ+J8SKRmlWOtstO5/ELmoRd49aPRxvwy2G9semrG7SXJangVJpYYueUV5rFhVtlmNkUOA9r5swo3y9/dKJINgbfV4gVCnQj5N4CTVWjEHJQ6bGQEZUeYqRo/INWbdGqPl7ptuAj/iiWACvLpZzP5+eZGQhwHfodzSS8UVeAs+5lru30SgoKgWWe8/BwRvzW8jEnBkSR16wztoWOP2NnsRvmFX+t9rBY3JBVuhPwjODdQFWaXX29mWtWiG7LY0En+6V2Rnixq2kpMXs7Wqh/2QAuS8KxL/ybavsMVgJS0cTy7gd2nfaoCZujjWROJT55S8wviPNTmYC1Iv//exYpczdiR21wUw1mFJb/Zt7ESC46IVtoyGUBr3S8SgsM6RxuVuzGU2+xuYTs4DklDCs0JdN30Ana2s= x-ms-traffictypediagnostic: PU1APC01HT021: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:PU1APC01HT021; BCL:0; PCL:0; RULEID:; SRVR:PU1APC01HT021; x-forefront-prvs: 07013D7479 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(199004)(189003)(6346003)(386003)(81156014)(102836004)(6506007)(72206003)(3660700001)(6916009)(86362001)(68736007)(55016002)(486006)(9686003)(82202002)(6436002)(20460500001)(104016004)(305945005)(97736004)(5640700003)(14454004)(1857600001)(2351001)(8676002)(3280700002)(5250100002)(2501003)(26005)(4326008)(7696005)(87572001)(73972006)(74316002)(83332001)(39060400002)(2900100001)(54906003)(106356001)(105586002)(8936002)(33656002)(476003)(5660300001)(25786009)(99286004)(15852004); DIR:OUT; SFP:1901; SCL:1; SRVR:PU1APC01HT021; 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: VmGgtGJcUkEf/yDPg6mgRxzXxKMNPk0tQ9Un6AmvC9Souy6P6OgdjHeUeYeLiUfyP+J+SbvwEgPyyf4RjEz0iUFaiQitfv/Jh+4uS3lNKZSmSThafJpivBbK/M8t5X1JgHsXaHuyj7LTk0qcrY0prXUufv3NKunXQtRNMmkeKscMJbDTrDkt6T+Gp3tmqG/L MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 12561fa5-026f-4957-0883-08d5cffad3a3 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-Network-Message-Id: 12561fa5-026f-4957-0883-08d5cffad3a3 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jun 2018 00:24:15.1221 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT021 X-Mailman-Approved-At: Tue, 12 Jun 2018 21:21:35 +0300 Subject: [FFmpeg-devel] [PATCH] qtrle_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/qtrle.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 670690d..1cceeff 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -415,6 +415,13 @@ static av_cold int qtrle_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);