From patchwork Tue Jun 12 00:43:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 9379 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp5782973jad; Tue, 12 Jun 2018 11:22:54 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKN8BllrZSB8gJ0E0ko0t3euYV6E9/Onf3ePO0nP+tfGTaKc0MDC0BaotZjowGljURcpWXc X-Received: by 2002:adf:9769:: with SMTP id r96-v6mr1365285wrb.57.1528827774826; Tue, 12 Jun 2018 11:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528827774; cv=none; d=google.com; s=arc-20160816; b=qS8r2cS9FUG602+pXPCRB34RkEkysHfkQFrVh3CWm2D0ke0F+Ju3/0LFRhVV0huHdI BF3CIOoQDGwSXNCkafKT4UUv+NDv+NqwgaG1GRiSu2BgUktv86p8i0uxXKqLQ45+A5rf s5TgDO4um5EDpctnAQR68wR7KpXKngH23aiyUt1rMgicGosabva/9WrkaMt2RgrKQBtv qCipPksOnxNHlOlRwLfV23wvqWUYTCBQsp/68sIOKs2mzhrPVWugmasDInZeXgJueUFS bu40qdWJtT5NXVONoKk0zcmVPtREzZzVj9o4qov8pmmQL7bQsLOslaJDNL47CYEiubRw z2Qg== 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=/+liLpSf7GKSz3eT6I4VIbgKS/hdK+ol7i8KX8cMh4c=; b=e+QcGcyY4OYdXyPJPcSzfZFbcMsq0EPale+WqZaec3nhCEJazTUsfObb/PWiH3hfjH wFgcwMAWx9RzZuQS71QupKIOtza6hx2p1GLIfEXp1MWQjFF3A6bax6HofUrbDIaiNJEJ OxZLi8eg88xPlaA8BSLjwXy4eZolFpcSZsmxrk8MepeYMCPgfOSO9MHmECbrnYrVBUlZ gs7wjD0I55Gwp5ICH+64nAEPfzVyqf2NAXBaOJPFoZg8VfiVwXzSfe38iYjqq+xT90T6 48XgYcL3df6vT2VaBR2icmTAPV7uzm0IiRLz2fxa1UOUZeCkaNmRN/UBuqrXMVuvyGnb l5Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b="ZMDbj6/H"; 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 e4-v6si606554wrp.453.2018.06.12.11.22.54; Tue, 12 Jun 2018 11:22:54 -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="ZMDbj6/H"; 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 22DF768AFC8; Tue, 12 Jun 2018 21:21:47 +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-oln040092253021.outbound.protection.outlook.com [40.92.253.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE2AA68AAAE for ; Tue, 12 Jun 2018 03:42:37 +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=apijxekCR7K4AMea5SFc3Nrkf0u8HC9ETovQgiKv3Kc=; b=ZMDbj6/HJCNgTlMallD/F4vSy2Uk8mibZGyTa+rd5nEX58RRMFW4TviHNcrC7Iw1cG2QYVjZY9zy9nLOQc4i9fkbGreuQAym1JBV95UKrQRCv//cbBvoJI6C9yfXRRwHrarBSJERacRANCxl+rupqjIgi9MKN54MqlLFgbmdymTUXnErhq9EZCzQNt7bf8N+Ggp5tcgRj4i4xmCCFJ2wu+8NIR6m4ybAj6Ksw9JcUZ9wz/9KoLdQ0TVgiEiMnWemqdhpjxSv5h3sKCi3GOJF9n/jo0bw+OcPIvCJ3K47mLO0UyJaV3ktUNMNb7nKwacYmUx1b28G/+KfpTuzQ2MYnQ== Received: from SG2APC01FT057.eop-APC01.prod.protection.outlook.com (10.152.250.60) by SG2APC01HT015.eop-APC01.prod.protection.outlook.com (10.152.250.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.841.10; Tue, 12 Jun 2018 00:43:24 +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:43:24 +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:43:24 +0000 From: Xiao Yang To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] cinvideo_decode_init: check frame dimensions Thread-Index: AQHUAeZeTpYHZC8c0EiPKrcVTNJ2cw== Date: Tue, 12 Jun 2018 00:43:24 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0PR03CA0079.apcprd03.prod.outlook.com (2603:1096:203:72::19) To SIXPR01MB0560.apcprd01.prod.exchangelabs.com (2a01:111:e400:b417::17) x-incomingtopheadermarker: OriginalChecksum:9728C90A7C3CA80C1ABAEE2A45EAB81CCF6EA837BD49F5F89FF154D4EFE2F3EC; UpperCasedChecksum:23E13147B157A92867681C6705B64309C71C7C9FA5B5D210139FB3379371D722; SizeAsReceived:7458; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [tM6Qlk7/XbH6vDavbvRwyOERzIy5JG+yiJGQzlS58AI=] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SG2APC01HT015; 7:W6ucFxeiH9G3bKgyIUateqpVZkc+XBeJenxsf4EvpVQaYAqD+BDQY4rcD2UFHH/WnBfIKHgIxmnENoUAUlAv4GTw6wZ4QNJAh0/lN9GetS7m7s5QvneQNK8SzSrsPMbwtLd9eefrArfpOxIUrG8LOXGPeJtsOwI/El13UbpeIs2weMjqEn6B2BBmiflpCmslfYmbncGWzqXuixNIOXk7z7yOs6PzM8B5tgDAACaH7iZpGVY/nnEvbH8NrNGvU6TS 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:SG2APC01HT015; x-ms-exchange-slblob-mailprops: 3yIWLBAu26uLDTYKVi+/4eqlR9f6kWq4e4+X+muCQk6Kz4ZpL3oXy63eQoRxlZYqwXCT6NP4wEkogMHXw/mYR+CfzJQQxNsblqzbci2+CbSSogkS4cn9Z8lKnHhbIG4HWHiQ+/KDp5mPNHmKdCV4xT0uo9WjjjSK0kc3oyBTZbN6aav7iqwfl62iM44XCHXPF9aQ4BKEjjtVGJjpcLcORmWcUNxJMRHp5Zj98xXuyy48UM7+esAGN/DQvpweAh7aMPiq0JVOUexWcaB0xTYa0ZINvqhGwxuRbmz8t00XXDtt4N0+tBsBLKRI8ktMyHQaxq8r65nypBPD9B0vSAZcUC7VhZa1gXPsxS1dKPRPFGKR9CdE91zbZTrG+CF6oOIb65DYuspYmNx2kHYIqLPn4OGM9k6bVBBycn3nG+CHJuqa6ExBpipdBMQQU5Z7BPIMFF0BIEv4SJstPg5jz1Z5Ath2WLLT97bqooCg8MDMSkVrSxknm9wCbwC8PCcKvQbN48yZsLJQ0LRxcuAGj6U4WSyMGVKD17wG4QgNMpeWIEGG1Rf4Jz3uzKl+ZiY71Q6GnA6U/MfiC6hmF+Lju4pcRD66UD4qgIHskmqgrw8pI+j7Sr1WZNl42LaEk1MMQMPQPo0z3cF2MPVHXqpKn1A+Qw== x-ms-traffictypediagnostic: SG2APC01HT015: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:SG2APC01HT015; BCL:0; PCL:0; RULEID:; SRVR:SG2APC01HT015; x-forefront-prvs: 07013D7479 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(189003)(199004)(3280700002)(82202002)(87572001)(7696005)(105586002)(5660300001)(14454004)(6916009)(106356001)(4326008)(6436002)(99286004)(20460500001)(55016002)(6346003)(5640700003)(3660700001)(102836004)(54906003)(39060400002)(25786009)(26005)(73972006)(83332001)(1857600001)(74316002)(305945005)(8676002)(81156014)(2900100001)(8936002)(386003)(486006)(6506007)(5250100002)(104016004)(72206003)(9686003)(68736007)(2501003)(575784001)(33656002)(2351001)(86362001)(476003)(97736004)(15852004); DIR:OUT; SFP:1901; SCL:1; SRVR:SG2APC01HT015; 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: jVXzIXvMWae1TIwrfCQ37VEgVtR07fR2YzlQ9VAbt1vCTMqejVuLU7oHqEdvAAD697nGzU+SbgYtB5bs3IZId/P470DxXjBKsrGEbRCcdUAd8MpORxGmm6r+XozlZoa65CtWZVjTgag5dtVsqsV29jt929hKFFFTHqsLxDDRWhRvWKciaZXy1goYew8334QD MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: bb10b908-1dec-4cce-27f5-08d5cffd8080 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-Network-Message-Id: bb10b908-1dec-4cce-27f5-08d5cffd8080 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jun 2018 00:43:24.1358 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2APC01HT015 X-Mailman-Approved-At: Tue, 12 Jun 2018 21:21:45 +0300 Subject: [FFmpeg-devel] [PATCH] cinvideo_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/dsicinvideo.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/dsicinvideo.c b/libavcodec/dsicinvideo.c index aa08041..d0f79d9 100644 --- a/libavcodec/dsicinvideo.c +++ b/libavcodec/dsicinvideo.c @@ -73,6 +73,13 @@ static av_cold int cinvideo_decode_init(AVCodecContext *avctx) cin->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); + } + cin->frame = av_frame_alloc(); if (!cin->frame) return AVERROR(ENOMEM);