From patchwork Tue Jun 12 00:25:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 9375 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp5782638jad; Tue, 12 Jun 2018 11:22:36 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIx2bI02W0AlyWjPwc7BAGxNkE6eRRUVLx+yPy50yO5pOb/UI3THbbk6ksv4uKnyI0Efp/e X-Received: by 2002:adf:82d1:: with SMTP id 75-v6mr1272440wrc.77.1528827756166; Tue, 12 Jun 2018 11:22:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528827756; cv=none; d=google.com; s=arc-20160816; b=j1PA5E9O3FVHW91bdaoIAe/mdXhGZN5B0LbCf3aWh+xpk9vu5nFMgRElqpskEXMiwx ByCAS5J5iWnWpWeyNM9PWPDPoYF79jhz+EmY1/6lQ0oAL+sC1WQ25fmvCGj8ZRH/aZ7H HKWuYth1+o+s/YBwQKkaDTPPHgcrCM9B4KqoAoZSQyOgMBgd+5Fqhek06S/Bmk3z0URb +qCdRGWUl6lUj8M0JCwo0HbK4LYaSLyVmeZ8OIPM8jBF4RHqBihifPvH9VcJ64tPHeCA Ha6AOgfUOHFVb9Fn4b+/w/74pNjWGTrQtlfFcNLqxBF7eSdtZv3A56+/f3SvbgNagL+u ukHw== 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=ZAxahoQw9IiD7XNyQN5BOaAQYaXWFfOsNOfUSogy5p8=; b=c6bf1IUcAJKxpZmR0cmx5QKb+8jBKCUPSs5tY2sKNjxYdtVs3m5wgLYTvc7J3VUGfw 07ukoE7tPOzgrUdkE9bwCovd8WTxWQSfsSxikHEO3r1YugixdXt3C1r2G1CvDaq+dPrv CPuiqb9a5ibImCeLzYqRieL0C6qB8Pjg1zgzRNlKVDOMXscmKlkT0R9G5AouHwyy6gHm oU957gJgNPx6gbiaH9Bmx31SkWdM+yRm2Sn5hCmC2CiZ89Y/to8xgxdY9NlrwRls+34R IL02ul1CCWKwwK1E4DeNQkvFFn+bW44RsOsG35zeBg1pnYFwa9YY5KTSWLKMoZ4yLAUh +hbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=soNRn0Pa; 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 u20-v6si773949wmd.51.2018.06.12.11.22.35; Tue, 12 Jun 2018 11:22:36 -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=soNRn0Pa; 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 0AD8768AF11; Tue, 12 Jun 2018 21:21:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-HK2-obe.outbound.protection.outlook.com (mail-oln040092255093.outbound.protection.outlook.com [40.92.255.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6259168ADA7 for ; Tue, 12 Jun 2018 03:25:11 +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=MWRhCjJVc71GUrg+fk87GjBNf3arid/uR8k5SNZvdU4=; b=soNRn0PaFoVDuQ3YJdd5QftwCB46y+DOOsz8Vk5xTYefKHDZyIWB4BC2h3TTfErY8x02q4UaMID0COk5p0pY/5FD+XS2z4Cp1q13NoZk9WpQF9UOd6HI42SHeLviMeqWJhEnKTpnapxApSIgIQk30ZjtXBDV4fQyl191j5dQBtkIl9xqzvsigsdjfxLNNd+ubvLFkC9IpxC+mMcJYQJKbcaE9tokS4o/KL50MmJzzRtGjBW4N2alydTdSz6MIulb1i+y1b1hf553UQHk7Mb3hlG5KoaSbtrH1eYO7Zj4VovaZjUnNBI3TZz4bCV9H/EcHyXnjwMIo4ElXnbu6sXNIg== Received: from PU1APC01FT061.eop-APC01.prod.protection.outlook.com (10.152.252.55) by PU1APC01HT073.eop-APC01.prod.protection.outlook.com (10.152.253.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.863.11; Tue, 12 Jun 2018 00:25:57 +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:25:57 +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:25:57 +0000 From: Xiao Yang To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] cinepak_decode_init: check frame dimensions Thread-Index: AQHUAePuPEuQituhuUWonZWjFFneZA== Date: Tue, 12 Jun 2018 00:25:57 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR03CA0088.apcprd03.prod.outlook.com (2603:1096:203:72::28) To SIXPR01MB0560.apcprd01.prod.exchangelabs.com (2a01:111:e400:b417::17) x-incomingtopheadermarker: OriginalChecksum:8EE85A984ADB5BEA2ED157AF87E2DDDBCC440B08C01643191E55FC23A314FD97; UpperCasedChecksum:F1BD88358944E757D45B8EBD3CF0326AD53567F571358CC2A0A470A4B84F0A51; SizeAsReceived:7442; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Z+R7W7OlaaRDnwfzgHugatnv8myGzI6NHlDSyTCoT1Y=] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; PU1APC01HT073; 7:sjvI9UqRaF3YWOt9OUzaYbMcr5XTb0ryCqv2SnKkdxMP7A0ANE/67rztyoP5QXRVNmPJTqrYKKVC4IVfGiqrGiaZVDe/JkIzGThPQkk9qH2MPpxPFPfV0CCifnk/D7Ofe1BYnN2XZuvLxvOD1Z5qYrSlANRgGdcmQKidVi9Em1jbRVSq7+jCqI5iklnidOFIrMxtTMM0uQcfBHstEzKL1dSCuf0slNbcSUC9euPJFwjmI7kkjg7pUrc2tpn8V/V7 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:PU1APC01HT073; x-ms-exchange-slblob-mailprops: kw4jv30d2yQdi6ZnMghgvftpBf+vN6Na1Dl8sLcpHonM7ZCCVbxMk+Adfk7Sa4NsmHjJjIWTBaVqtYFsMjMilWjFKdJFI6syoGYG2LE/ix+IYnHwYhYdnoo53+Q9ex8HtnJnS0uExzqFfxWq7AOMExUZ+zD2IEbN4mF2EQAfvZnPO4C3bqBGUBhN9NQpNL3EUX1Uov+uIqiPbzXaHyeFz8X6ccaB65izxyA2ohT6I/yV/dQnzJafUXrS2Gaxzp+5HzIyxhLbVNe1kU0RN6wsRHXJCNJa2ECS7ngvpArl5xXOL441JHNyApVTSaW1+mtNUGVbrQktgfLOKeIN4o4KYIe4mkFGz3VYUkTmxH5bMRYa2xivTy7X5vNzzs8y3EB3dDGrHVjfz4tIHElxqvvYNS3Ezv57Yr1Wm26lxBF5RaPJwWVsp76/opF0MdOvof5igKyUYx8Hxj58TbcqSPEbcytZq2hSz+FcZaosWMm8Pm5aTfPhvMgGYFsWuOatK0eUxVfcP2UgF1pXDKv5EYEo4eHetRrNN9iOh0wTEZfDo8no1ecvyPuPtu0FQHvGwk0uVV33YCrMKmTN3vMVXGYvlllTOFfT0powCAeElBBGGmTD6MNEQYWa+YBRLIyrKolcgf+43dh6DbRl9jqC1n6dlfvEfKWPStjt8+lwU5dZcgI= x-ms-traffictypediagnostic: PU1APC01HT073: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:PU1APC01HT073; BCL:0; PCL:0; RULEID:; SRVR:PU1APC01HT073; x-forefront-prvs: 07013D7479 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(199004)(189003)(2900100001)(102836004)(83332001)(6346003)(99286004)(2351001)(4326008)(105586002)(68736007)(106356001)(104016004)(476003)(8936002)(81156014)(8676002)(87572001)(86362001)(97736004)(26005)(6916009)(5660300001)(486006)(386003)(6506007)(1857600001)(54906003)(14454004)(72206003)(3660700001)(33656002)(3280700002)(74316002)(20460500001)(2501003)(6436002)(305945005)(39060400002)(73972006)(9686003)(55016002)(7696005)(82202002)(5250100002)(25786009)(5640700003)(15852004); DIR:OUT; SFP:1901; SCL:1; SRVR:PU1APC01HT073; 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: D6KyMvMqElS8n6bNf9fkYYrefJesb0S3CcoZhnSlPGZtpN0k5CJCbIYKTrMhUuTThto6GeyDa3v4GLwklvOTcpMyeq7KgmNLXqyGLOWWJTV69IFdcl0QfDbLFQ72oTi7/wWd2V/pGSQfcj46M3Q0DDQzPlkvzPcixQ7/IxiRhhaA7ZZCaC0xKNr23LZ8YODz MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 80948bdd-3e18-48b6-e329-08d5cffb10ce X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-Network-Message-Id: 80948bdd-3e18-48b6-e329-08d5cffb10ce X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jun 2018 00:25:57.4272 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT073 X-Mailman-Approved-At: Tue, 12 Jun 2018 21:21:38 +0300 Subject: [FFmpeg-devel] [PATCH] cinepak_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/cinepak.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 9b00774..3713ec0 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -430,6 +430,13 @@ static av_cold int cinepak_decode_init(AVCodecContext *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);