From patchwork Mon Nov 27 02:05:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 6384 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1111417jah; Sun, 26 Nov 2017 18:05:58 -0800 (PST) X-Google-Smtp-Source: AGs4zMZq8IF3DTwNwsChnlFXfamyQLl4S8gPXSbhMnwUr6CpmUgv2Cv9oPBY2fTPxtqjq5TQVzja X-Received: by 10.223.139.3 with SMTP id n3mr25932860wra.166.1511748358208; Sun, 26 Nov 2017 18:05:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511748358; cv=none; d=google.com; s=arc-20160816; b=c8Mx8JO7yDTt3v/PGuYU9vjr+fA1Lf/yzzzWEI0ZhToPqA01XsoFIj6U9QOGYXRWtB gy+460hKWDPaqWb/lQKOQELp8SFvkcwPdua1LEueIzZeZ+OYVpHjfO/l0Tdir7/J630R 0WGkTAdnE0KkHHY0FsRYJPTAQSKJS+HRQ0HP49BDZ5TnU4SGiUmeKizcszFXO/gICMAU PQ7HwNLLSFqhLg4Wc1iJKRhMtmiuCOFYz0ilfs0uIYGl7axF+djgtqMKNYFgkf9uVD9+ yhEas/dmnAP+oB6M99jyUFURPJeL5/8EjJ5AV9OL2sQGwOsGb2gfy4Zo6VCZ7uASJx9D Qo7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=mrpBpSTrmfvxpR4ZQLdwPylqCNjAAsgx1y0gNrEGde8=; b=dzdOnWUOSdFo7By/lVAQ7ELCs1mHRj0lL6wfeiV7IBSYlJ5W2HKVh3+Aqk1b6Pf5cM 2jtRGC005DCV9JqlMG9i5Ey7peHFtzLCgihxBbFJc2BVylfJyH831kEGPBLRtDydzMDv QUB7dA615GORgg/c8w5dbN50SvSPh55n8qzgPd1zOXrAQ3af8V5J9PKyTrLko97b0zRR UGKERwYHv6JNTi0jeUC8JEyXsdpXsff/UOJRHYVSS29UqRCozOhiY8foJCGOh+vrIEVm Pf66X2l0LXmeCVBcoFgPyeH7E9luF8D0snfUjxP+lajujxgTGpsItolE+KP2I9bdinM2 fiyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BMLPBnnM; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f63si10773968wmd.213.2017.11.26.18.05.57; Sun, 26 Nov 2017 18:05:58 -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 header.s=20161025 header.b=BMLPBnnM; 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 730ED689CA4; Mon, 27 Nov 2017 04:05:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f173.google.com (mail-io0-f173.google.com [209.85.223.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 615A8689219 for ; Mon, 27 Nov 2017 04:05:47 +0200 (EET) Received: by mail-io0-f173.google.com with SMTP id i38so34671445iod.2 for ; Sun, 26 Nov 2017 18:05:49 -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=ksVeT53LB0crycRBA0dFf4OKuoTEh1UxPcmJabnbV9A=; b=BMLPBnnMI08VOd74SxyA0HvzG0XbT54f2MKmbogIHKckBswP0WdXHsqYDKNUc0PjOY 9TwscYEGi8682yHSmMelikWfF5qM+gDqhUHC1OQ0P0WmIETSjc1ZpzS/V7IkzGnVEAMs fJ+K7bKhSTYgQ1M/rFLjnzWtEYsYyflEBHN+mOI2C3132nNqxYBpDJorh9aWZvNC8rFh s0WauSUKYGYyk28SAGLLQRZOQesNxMwV2kyoj5Go7HJfvACfhNzQyYGA0p3uOFZWw/dj Cy//bxYOwHAZjht1cLdS+OnqHjscxkwu8kLWV+PZGG9xWKXlBsbX4Coo7pq1yFT55txM jInQ== 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=ksVeT53LB0crycRBA0dFf4OKuoTEh1UxPcmJabnbV9A=; b=jOG3anlaMtHJHg7nVeN2DEuSYTdkeglnNMFr3RAuOxKmu4L5VQ/UhfU4wYYm4dPogJ F8cD4xj73s7pvPa2J9pS/kJ+SseDbo0zjhHnourYHYD7SjV4cgkPuCzeF6qDfOpFgTlW 3iKeMQY05Ib/EnPNyfakMWhlD27ZAaxjmFqWBYftkSU27pkxwaGMKposi/g7RjlFpPe/ IQMyBGtg3LFTBpcgJG1kr7nEbEitzPBSqv8F5yIiYlpU209dUDFbL+eOerx4wXJcfaX+ mGjUJLraj6cl/eGvjJzFUflg9XhE2PozdjoN2ioFgEz8iu030C6YGjxWS3dIl18ogA6o Ecdg== X-Gm-Message-State: AJaThX4k2YDeRddQVhZtm/vOPEkKjvYDM4JfWvLYH1h9voQ8wF3Tqm4W ClZb+3NXvW0CPEzXto4p5FVRJlUjm7+8gQIA3mg= X-Received: by 10.107.16.206 with SMTP id 75mr18132694ioq.83.1511748347687; Sun, 26 Nov 2017 18:05:47 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.155.66 with HTTP; Sun, 26 Nov 2017 18:05:27 -0800 (PST) From: Carl Eugen Hoyos Date: Mon, 27 Nov 2017 03:05:27 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/gifdec: Do not error out on resolution bigger than screen size 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" Hi! Attached patch fixes ticket #6874 for me. I don't think it makes much sense to discuss what the specification means with "logical screen size" and "raster screen size" and "physical display": Not only do other decoders accept such files, our decoder already contains the necessary code to crop the image. I believe that it could at least be argued that the specification allows such files. Please comment, Carl Eugen From 47f5d312461a0d30cd1e70d819ae1daefbb5eebb Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 27 Nov 2017 02:57:50 +0100 Subject: [PATCH] lavc/gifdec: Do not error out if resolution is bigger than screen dimension. This is what other decoders do. Fixes ticket #6874. --- libavcodec/gifdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 2eeed4c..59d866b 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -179,11 +179,11 @@ 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) { + if (!width || left >= s->screen_width) { av_log(s->avctx, AV_LOG_ERROR, "Invalid image width.\n"); return AVERROR_INVALIDDATA; } - if (!height || height > s->screen_height || top >= s->screen_height) { + if (!height || top >= s->screen_height) { av_log(s->avctx, AV_LOG_ERROR, "Invalid image height.\n"); return AVERROR_INVALIDDATA; } -- 1.7.10.4