From patchwork Wed Jan 11 20:55:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Vignali X-Patchwork-Id: 2183 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp970930vsb; Wed, 11 Jan 2017 12:55:44 -0800 (PST) X-Received: by 10.194.205.225 with SMTP id lj1mr7385822wjc.122.1484168144371; Wed, 11 Jan 2017 12:55:44 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eq7si5449532wjc.293.2017.01.11.12.55.43; Wed, 11 Jan 2017 12:55:44 -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=@gmail.com; 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=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05B1568A1BA; Wed, 11 Jan 2017 22:55:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f48.google.com (mail-oi0-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E13FA68A093 for ; Wed, 11 Jan 2017 22:55:27 +0200 (EET) Received: by mail-oi0-f48.google.com with SMTP id w204so104293621oiw.0 for ; Wed, 11 Jan 2017 12:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Y8EIj6dC/TaoUG9dc0IsYE36W13Dy9KfiU+Q4TjrR60=; b=aPCD94dozR13WLVSHjPL4iFNtXqECaW5i+fvEavI1UUOYogcwtoGmQccSn0dst/j53 bhWzTEdJW59t7CC49NKwVm/fAIEFr96yHihGp3f6NoMGhcqmpe1tSijKwH+8C8MBvt0W XHaJLHeFta7PZ0HFoZsLTD7sI9MuRYcF6BT3zYlBluyoisxCp+E9hhHJjb+8YL3RTVp0 aeOwpL+h6Nm2WX9M30xjDLJLD7sahk+YgPj8oaQvyuMtulXmHbbxvrzoNrWanF9HcNgE jUy52OW7LyMJpzoZYxgAo/Ealtmx++8nVveTgi4phwMmX3aIiXPpjMhWt5MszjQDzDWO EZRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Y8EIj6dC/TaoUG9dc0IsYE36W13Dy9KfiU+Q4TjrR60=; b=ef2OZoea7zP5fFUkDBc8vGnRs5lHfyJozF7HCO0uPhH6G+D/03K2+rpM0qabbamTmc 58uo2ZghAFiWbXdkjkV+7FDCGIG2EO9bnovHe/JekRF7HQ2B1KvY7o0NTK6rPtU2a+uY L7gCPmgoY6FjM/tIalKyj/qIAZoz9TXoWDyzyb5aB2mXR8TAryrX1kLB71GKFdFTsRQJ J+dMOBsc2/NijLuHL98q+uJPKFFfYDROG3T+nGTUJNTalO9m3K/yuvJV+dZSy9J95SqT 8aDF2fhXIhBv9+TZDcw2mI+ZF8mCtQnElflY3tAaPWHuQJXf+HS92iPvPaQwRjCie524 mh+g== X-Gm-Message-State: AIkVDXKY3ntfLu2D8ANHiT3yyP6oCtf28DwWB6Pa9WuyZBcrjZYIDg8MUEnF4YymFQ6D+pdW2HRzNSJvcpDBUg== X-Received: by 10.202.91.137 with SMTP id p131mr5450321oib.73.1484168133722; Wed, 11 Jan 2017 12:55:33 -0800 (PST) MIME-Version: 1.0 Received: by 10.182.29.162 with HTTP; Wed, 11 Jan 2017 12:55:33 -0800 (PST) From: Martin Vignali Date: Wed, 11 Jan 2017 21:55:33 +0100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] libavcodec/psd : add test for channel depth/count in bitmap mode 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hello, Patch in attach add test for channel depth and channel count in bitmap mode and return invalid data, if channel count or depth != 1. Martin From e1ae30182861bebbee7ce640db4e7038bff09e75 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Wed, 11 Jan 2017 21:47:56 +0100 Subject: [PATCH 1/2] libavcodec/psd : add test for channel depth/channel count in bitmap mode --- libavcodec/psd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/psd.c b/libavcodec/psd.c index 4d6b0e3..66f2ec2 100644 --- a/libavcodec/psd.c +++ b/libavcodec/psd.c @@ -319,6 +319,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, switch (s->color_mode) { case PSD_BITMAP: + if (s->channel_depth != 1 || s->channel_count != 1) { + av_log(s->avctx, AV_LOG_ERROR, + "Invalid bitmap file (channel_depth %d, channel_count %d)\n", + s->channel_depth, s->channel_count); + return AVERROR_INVALIDDATA; + } s->line_size = s->width + 7 >> 3; avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; break; -- 1.9.3 (Apple Git-50)