From patchwork Mon Nov 13 10:16:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 6028 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1917071jah; Mon, 13 Nov 2017 02:16:31 -0800 (PST) X-Google-Smtp-Source: AGs4zMZGvK4Nqh6Afz5EJz/ExFYR668s0pIH3lZOlBZbY7NQK95bXTP29p/djho/W7cRMmayssG+ X-Received: by 10.223.135.121 with SMTP id 54mr6623831wrz.160.1510568191561; Mon, 13 Nov 2017 02:16:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510568191; cv=none; d=google.com; s=arc-20160816; b=roldYN+TNHpKQrNqW8wDj0BYI37KdnI3BUJKhSKnb61ADOPCckDUelUkZ+Kc+g9kFi Q+6tsS4QiKVNttkgaxBf45z3pCZOhfycrOh+eHR6obM1VN6xmG0SsEpxCuZsKJkKJX2Z mPVbJmlrrexuTbl7ZYo0vc2n3lnt/kOWr4JxchZQfUnFTGUpyEFHNN+TtFRAgwPmd2S3 qfVu+ysIvih1c9pUT0yE6jlrqX1QgmJTJgkSiogYDQ/HY/90NtS2aQkbHQ02sy+c1rYN qXo9U3GjuMUmuvGX1p6cnal0pjMplz9r312nIY+rMMYlynEvL0XxIyOLlR7xacH9/8jC o8Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=3uO89AB7ofI20iQTPGqmGNAWhUmf3gLULBocMLjuNXc=; b=A/px9GXKa9wNiYdglkv97RllXcxXomCVuR1kTnr+rfJ5YbfC+CbcBWBSFXox8pzDsA eqQPCqiprB1dOFV8xEK2bQx0vFpgtNnkDrol4DAK6x/x1Z/MzzkX8pCF1Tn2U3YFnuOS /6dzJwD4vXkzzMRP0WXwTBECGdBuASzBfTafNJ57gegUOZq0Rba/lIjjxHPe+hOoI8sr G4Qh5cKufucrsi3lFPm+NjxyLnJKuZv4bJEEHeWnsdf9lrwJyUbGfl2+9WYJxsr4srYz 9nyK3rT9/zV8vEmb9YTb7lcnJ/sj3bBJRExsRk6Inv/7by/365yFOyhKuKLj2ksM1zZf Ec2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=h0EeUFY5; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i65si3416955wma.166.2017.11.13.02.16.30; Mon, 13 Nov 2017 02:16:31 -0800 (PST) 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=@rothenpieler.org header.s=mail header.b=h0EeUFY5; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09CEB68A0D4; Mon, 13 Nov 2017 12:16:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A99B689C1D for ; Mon, 13 Nov 2017 12:16:09 +0200 (EET) Received: from localhost.localdomain (unknown [IPv6:2a02:8109:43f:959c:ba97:5aff:fe10:ec69]) by btbn.de (Postfix) with ESMTPSA id 25C0F30841E; Mon, 13 Nov 2017 11:16:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1510568183; bh=N+9WHhtV/ttK0zPD8YyE4gv9MVeXQ6IsPP7wf8zQvck=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h0EeUFY5qW2VmtLHvbSjLE5YTVPTlyHDyqsOkklivuL4DEmYCl7XgTpaPzu1Obp0V Ov5OhAq2k8tu9g8gBnTqtYeMYqPukfY7+BoLLzxendzv0Z8vLJi4NG538CL/bp7M8I gTyfxKwwBuEy+3Y08umnztzO9qj0wwrWjrodCHZo= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2017 11:16:09 +0100 Message-Id: <20171113101609.4224-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171108200734.GK6009@nb4> References: <20171108200734.GK6009@nb4> Subject: [FFmpeg-devel] [PATCH] avformat/fitsenc: validate input pixel format 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: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes CID #1416961 and #1416962 --- libavformat/fitsenc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/fitsenc.c b/libavformat/fitsenc.c index 7cb171596c..cc3999aa8a 100644 --- a/libavformat/fitsenc.c +++ b/libavformat/fitsenc.c @@ -106,6 +106,8 @@ static int write_image_header(AVFormatContext *s) } bzero = 32768; break; + default: + return AVERROR(EINVAL); } if (fitsctx->first_image) { @@ -166,7 +168,9 @@ static int write_image_header(AVFormatContext *s) static int fits_write_packet(AVFormatContext *s, AVPacket *pkt) { - write_image_header(s); + int ret = write_image_header(s); + if (ret < 0) + return ret; avio_write(s->pb, pkt->data, pkt->size); return 0; }