From patchwork Wed Nov 7 00:34:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 10949 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 6EF4244D910 for ; Wed, 7 Nov 2018 02:34:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D39A868A61C; Wed, 7 Nov 2018 02:33:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC38768A273 for ; Wed, 7 Nov 2018 02:33:45 +0200 (EET) Received: by mail-io1-f66.google.com with SMTP id p83-v6so10677898iod.12 for ; Tue, 06 Nov 2018 16:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=utwmTRBPBsnAUZN91ziTJeTlZctJqr+dn76qm0s8Axc=; b=VllQavP0Iikw9mIavwE7XOXzCCOlZ77HWFPIZ7Hr9klEoDEJJrma7b8nXMvBZKKqmT kEAXENKItais/3PE3mz/8laUR9ID0R6YiS2nWRsm3qLBYp2j4mXpvZJOO5hBqcLHlFim up/Px17lEk1SztdjtoVG0YXKKpFEtvMy9o49c4mYI1xCFJACmcahWnIS0YJ7JHXP/0JC sZCxdR0yHL50rWnZ+Y9y/2owxOh5oYbydI7IruoXVZq/GafVhfSjT9GgApGDpnk/HZS5 OeDv8pcasQZKuGHQCFrxWp7I6srmtkJv9zuLf9HCRnWPA1AQ32nPJZ4GT8hn6LwzBqRE 6iDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=utwmTRBPBsnAUZN91ziTJeTlZctJqr+dn76qm0s8Axc=; b=QL04H63aAgpdnOYEmZBzKczefSegedaqydxCfWVrANlYc8c47OILBUC6NzF8xLm+h1 Ife38wQVawAZWCy6GNfoX8jtPbq4KFCyejyUK4SwPfc0jtLpvyn0fPEMNUXgNW5Err2P s9eJ6rHi9ZV0qINr+abGsFshnutLRUdhPNnjhXSsAzIc3bpsxX7mC0AFs1S7y0EhIZxG HpUciIpeoY3yGoQYcE8sSezf10VlnSpNl/hMX/ESPsSpp0udtuOFyvvUVWPOMf9tNea3 0T5ZyB8whI27SzlsfldRqTQAUdoybxlGrbFS0cr6zkdxRvb6GCqwa2QKb00REXwdAUZe uShQ== X-Gm-Message-State: AGRZ1gIbZWW6ugAI8S8hdharA6LbzewSVJ1x4f2VUcSO6xbdDnhEjNkM VxpL9Xg05Y/yWUp4u1dH4jEbBKE/7WZ0DCD/6JTV0A== X-Google-Smtp-Source: AJdET5eqBNnuB14hO0dtvz5NGSEwrIoCVaXMd/Gim9LNfjHC69KdnCPVgHSJLlnqonXgAsO6+HYZMI9n3jKnsa2EmO0= X-Received: by 2002:a6b:bf86:: with SMTP id p128-v6mr23685246iof.49.1541550858789; Tue, 06 Nov 2018 16:34:18 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:9854:0:0:0:0:0 with HTTP; Tue, 6 Nov 2018 16:34:17 -0800 (PST) In-Reply-To: References: From: Carl Eugen Hoyos Date: Wed, 7 Nov 2018 01:34:17 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavf/apngdec: Return eof for incomplete 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2018-11-07 1:07 GMT+01:00, Marton Balint : > > > On Wed, 7 Nov 2018, Carl Eugen Hoyos wrote: > >> Hi! >> >> Attached patch silences the console flooding for incomplete apng files >> and fixes ticket #7536: >> In-stream tag=[0][0][0][0] (0x00000000) len=0 is not implemented. >> Update your FFmpeg version... >> >> Please comment, Carl Eugen >> > >>+ >>+ if (pb->eof_reached) >>+ return AVERROR_EOF; >>+ > > Why not avio_feof(pb)? New patch attached. Please comment, Carl Eugen From ec289871a5ee8e47c46a5c9afcc7385d673472c8 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 7 Nov 2018 01:31:18 +0100 Subject: [PATCH] lavf/apngdec: Return EOF for incomplete files. Fixes ticket #7536. --- libavformat/apngdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index f9a97e5..53cdd45 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -342,6 +342,10 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt) len = avio_rb32(pb); tag = avio_rl32(pb); + + if (avio_feof(pb)) + return AVERROR_EOF; + switch (tag) { case MKTAG('f', 'c', 'T', 'L'): if (len != 26) -- 1.7.10.4