From patchwork Tue Nov 6 23:11:55 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: 10948 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 412FF44D8CF for ; Wed, 7 Nov 2018 01:11:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 967A268A273; Wed, 7 Nov 2018 01:11:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f175.google.com (mail-it1-f175.google.com [209.85.166.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DBCE689891 for ; Wed, 7 Nov 2018 01:11:23 +0200 (EET) Received: by mail-it1-f175.google.com with SMTP id v11so14080001itj.0 for ; Tue, 06 Nov 2018 15:11:58 -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=kKN+8a1MEDa76vph6VFV+33BVom/1NIh2mIWFXPlyfM=; b=pRO3TnvydmaQ3s/JmR4QXdnGrfqGwGf2C5iWC3lV5FgF/cwXxLJPK1HVpcPwA0XaSC KdAqKJWZkLPT+GU9Y5ZmL4tsjlmUc1tvMgMk9x67K4Sp0rl/4D8G3kI1jBoQAoB51kqR QQcKv1toM/mQI1xmScBLcUscF12a+13ce6UoKnIq7UWfDq3IF1pTYaVx3C/g9othebSk VOYYr7fJCAeOeTBsYB645DFzmnJuUtFJgcJNU3WkI+g22w8yKq4Rm6CJ5rgzA3cJluFl qtOknsIJ4b5lbu5pz+RWsyTh0NzGpO5ypp62YkFl+CpWlwjNg3yxg4/wua22Ryn3hu9I rQ6A== 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=kKN+8a1MEDa76vph6VFV+33BVom/1NIh2mIWFXPlyfM=; b=GX28aCjsFU5/OR/RMsb6uZeTCfMR0BKA2A4LrvppZva5db5IrSJC379UtR8Odd0RkB 9jnQLtlK0IXl8/2UuGDTR7d1CMCKntLnR+kjMFEJ3AxaIzAdW3HAY+cYf0xQOdsVB66B sUXDPbeBkjP23cpUjcDR3zbfY3wJp2X/QQAcePCl7NPcaDYHY2hIUjevwhu6htVbLDAz QUsvhdhTYlA0sxz6xJZqbjYCXZbte/Lif7tnI2nN+u63UgUSxOrrFshL7XED1kZpXPZM XndvkcYQfg9mcBMCjsul2Zy0/HE15Yky+qVv5feUF6HSRG7ljq3xS1/wAmJ8zao4Loqg CKwQ== X-Gm-Message-State: AGRZ1gIhsNquRgtMcy2lfMu2CTDrT4MFhY9wFFJFjzd0uz86Qyr5pw07 eC1IZnKGUlMdB/j2UOtHyWKAdRT2Z27ktwY2LMP2rw== X-Google-Smtp-Source: AJdET5dEZdDqXu87AvpGe+JSD0Bz6IGIuwTsd3SCrqTSPqOL2G4ZsmftVPD7Ip6Q1Ea15SB7bqsdDlbsSdftK5Kj53o= X-Received: by 2002:a02:7fcd:: with SMTP id r196-v6mr3851190jac.31.1541545916709; Tue, 06 Nov 2018 15:11:56 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:9854:0:0:0:0:0 with HTTP; Tue, 6 Nov 2018 15:11:55 -0800 (PST) From: Carl Eugen Hoyos Date: Wed, 7 Nov 2018 00:11:55 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [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" 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 From dd384a34e1e8ca52f639132d3ba002c5b0534391 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 7 Nov 2018 00:09:31 +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..0ee3092 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 (pb->eof_reached) + return AVERROR_EOF; + switch (tag) { case MKTAG('f', 'c', 'T', 'L'): if (len != 26) -- 1.7.10.4