From patchwork Tue Dec 10 21:59:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16708 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 5D15D44A835 for ; Wed, 11 Dec 2019 00:00:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F02968B543; Wed, 11 Dec 2019 00:00:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0953B68B01B for ; Wed, 11 Dec 2019 00:00:29 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id c9so21843697wrw.8 for ; Tue, 10 Dec 2019 14:00:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GJ87CNsCv2ExvWC/9XgLVOgXK8o5uhlyJPWeoEobmQk=; b=bcaE0ojk4AgxFeTUQNViq/c2Fm1wKh25gu3ji0Y8yP7PCIuA9wzbSRMnULSW9EGKkZ 2mVQepaoy8Azc5obdff6Qcmq6WYAtJP3lsOAJcfk9ntiwNPdDdiMHMiO3lWHIt1AEXNA ER4BWnyL7gNmCW8jYmx5oxJN2iSasKeNSrBXGuV9b6vZ1mGB1AN5rfYpIsZ96njr/5Rp LmRVCxH4MrUtn40Aiuf+MoPOSgNAMBFop7WzuJSiFfGao2k8oEzLR7E+Epr2bJ/eXui7 cbWYb/WuOeXwB6Gx5FSObv2lJl3AelZalVOR5ISj2nzWybDZUUHGmn6sEVLba6KoctMq hghw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GJ87CNsCv2ExvWC/9XgLVOgXK8o5uhlyJPWeoEobmQk=; b=a6Zg9askXrifiSTljkDePakpEjnkR5faED6Q132SQeNX7pRpXzIVme2PqIvM/4qyKH 5bSD38MW+20FmGG9nlxaci3vPo3BlzAQrz1gtZC+n9JJ+/N3/+5lH3PGzC/utMx7KT+2 vbBX9CNKgPmVbWPyBeqM5t0XeF1w2mI8tQIrC7krsJgK1cSJaJHmViBbFVmrA66GzBeX LclH1qQ27NXMXapJaahFuQrykOZu0QlpfQuqFkkDew4FOsVH5hoLuHAZNeCxULQL7uMY 130kq/44vNqnIHEN4mK6+8stm07Vi0IKqDvBK/ocbkWFogbsoKcMZXPZJZL2BjzGIGkD K41g== X-Gm-Message-State: APjAAAU2S6WuhVmLhnq2NrPArKctyda35Qc+SWbq6i0hhmUabTbSuuVn w52Q1DFpAjymHoVcYJ6IP5Bbwngg X-Google-Smtp-Source: APXvYqygbLKjo6m52mCcidC2n7+NcCQ86CrX+XFlRIKWwEmJ82iHUI2KEHSb3j+XcQ871N1yyBX3Qg== X-Received: by 2002:adf:eb0a:: with SMTP id s10mr5983855wrn.320.1576015228378; Tue, 10 Dec 2019 14:00:28 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id n129sm3876381wmb.1.2019.12.10.14.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2019 14:00:27 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Dec 2019 22:59:48 +0100 Message-Id: <20191210215955.11178-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210215955.11178-1-andreas.rheinhardt@gmail.com> References: <20191210215955.11178-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/11] avformat/apngdec: Return error when header incomplete 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When an incomplete header is encountered, apng_read_header would under certain circumstances only return the return value of the last successfull call. So override this by returning AVERROR_EOF manually. Signed-off-by: Andreas Rheinhardt --- libavformat/apngdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index 0f1d04a365..6c58fd9d04 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -240,6 +240,8 @@ static int apng_read_header(AVFormatContext *s) } } + return AVERROR_EOF; + fail: return ret; }