From patchwork Mon Dec 10 12:34:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11363 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 12F2644CA96 for ; Mon, 10 Dec 2018 14:35:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5992568AB7F; Mon, 10 Dec 2018 14:34:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E183568A9C9 for ; Mon, 10 Dec 2018 14:34:49 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id y185so6528974wmd.1 for ; Mon, 10 Dec 2018 04:35:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Zrc+1PqlPn96NRe3ZvK89fYOqdCL9S6j9cRTsiDoaAw=; b=WYGm/hNWr7RVulBR46MF8Qv4g6pyXzhZjVwBnUa5MzA6XrWiMvI3mz62LxgkFxbNx6 Urx3TZ9vD5tuOXnawowE/1PGPuiqHgF4D4Fea43WuktZ75kVFieMV6ccXs4SSk19+aAK 6wY69hBzkkFNSEx0xGMcTHzQFQIVVOzpRmVtb8RHsUBqDu/wblb2BRssAuZkY5kWLsKG 1LiPM1VaDxqVpnQH9m6Sd/4Xi1x0gj+P/soVL+MyKOaDczDuXGKEG1M/e6v3YEta+ScM I4f6y2i2gIjad+NQZdecB09Kodcbb8T61upe5MLGy9R1Evcy6+F5p6APO4tLtcfpsSkA C0/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Zrc+1PqlPn96NRe3ZvK89fYOqdCL9S6j9cRTsiDoaAw=; b=CfWBTZthmo+0fgHDeySA+IIv293L/oCGXqzIg5J4has8apCkPM50JUKCp9ZlWNSg8c lnA8D+LeQasCkZu1Qpm/jY/GFpck8Z+2Cy00X7eUI4EGlk6f9Ci2NiFyfAHLYgvFjWPC FpUsGZlOv1ecUmefXsZ6AUml4OjWkR5T7sC2gqlBI/dBsxtJw65T8VNyGCeNzJiL+JSr NNDH5dmITn2wbF1ybqViZ8D7Sr81kAI4UFlN5MKinNgfa/qSUIH4T9jtVHEDF61qLrja WK0pc9OOAX6h90hGvnsEydH9vwvXPRRGjWZ7ogQYz29/I2pv3CjMNcNMQ8iWjcjeSCuI VjHQ== X-Gm-Message-State: AA+aEWYYzZWfZnKeDNWXJ5/98RcvMCYPTrF0ljA7i0E1OynAB5bFGk+u 1GZSC5tvhNCXtMsBel1JAvwVeFjV X-Google-Smtp-Source: AFSGD/UBfb0bL4cdYMmF2Y4UH1wm/4vPs8Inv3R/5ngjlJyARj1Myg68BOCAIADElw+N6LadL3Ik4A== X-Received: by 2002:a1c:f404:: with SMTP id z4mr10543634wma.68.1544445300331; Mon, 10 Dec 2018 04:35:00 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id o64sm20709448wmo.47.2018.12.10.04.34.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 04:34:59 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Dec 2018 13:34:53 +0100 Message-Id: <20181210123453.10874-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/gifdec: truncate too big width/height for invalid gif files 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #6874. Signed-off-by: Paul B Mahol --- libavcodec/gifdec.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 54f1d4c0ba..0eb1c21d99 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -179,12 +179,20 @@ static int gif_read_image(GifState *s, AVFrame *frame) } /* verify that all the image is inside the screen dimensions */ - if (!width || width > s->screen_width || left >= s->screen_width) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid image width.\n"); + if (!width || width > s->screen_width) { + av_log(s->avctx, AV_LOG_WARNING, "Invalid image width: %d, truncating.\n", width); + width = s->screen_width; + } + if (left >= s->screen_width) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid left position: %d.\n", left); return AVERROR_INVALIDDATA; } - if (!height || height > s->screen_height || top >= s->screen_height) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid image height.\n"); + if (!height || height > s->screen_height) { + av_log(s->avctx, AV_LOG_WARNING, "Invalid image height, truncating: %d.\n", height); + height = s->screen_height; + } + if (top >= s->screen_height) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid top position: %d.\n", top); return AVERROR_INVALIDDATA; } if (left + width > s->screen_width) {