From patchwork Wed Dec 11 11:14:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16733 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 A26BF44A7A7 for ; Wed, 11 Dec 2019 13:14:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 852BB68AAF2; Wed, 11 Dec 2019 13:14:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49F2368AAF2 for ; Wed, 11 Dec 2019 13:14:22 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id p17so6543744wma.1 for ; Wed, 11 Dec 2019 03:14:22 -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=QwHBCmgL2HX0fxu516376BCY8VxdjKRV/esrt+trozY=; b=QMlTBC23GDo1TNTTFdT+YDM/878ew+9SrcDxHKpw7vATsh2+0ooQxyhagWD89EmPZD FI/+gwn4VUUdwqmC5m53MtwzKGwN/rFKyRPaVuz+ecH8yTCOLhu81FA7tPVz173Qp+WV pMY7PXeHeKvWQZHsUrY6MbaBujfIu8q4/R+UMZ8t20i2eXUel8Feca15zy2mfMM1jDGA B/Aj7yqTT6unDKigLI5QPhld1BlwC2dfaFRhxyCrpApZAU/ofpZkWSickHQEH7Xbbuqd I5SI79NbIRxgnOoeiDHa/ETwX8gi8rfx6NuhuQPer8tFUrs+aB76+Fb+8iWFCQMl5GAo 5qLA== 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=QwHBCmgL2HX0fxu516376BCY8VxdjKRV/esrt+trozY=; b=bBm/4A41EzcxZ2Z84f4AD0kTfiySkifUupNuBoR5KooBzJv2+RNhs2Ym+5AWwaP5F+ JNhqhdIorQwivNtlfATYAb4Mm7b0T6qI1EqXnujCeMOsxHbB+ZDMXSq+4KPMt/Udnqzy ROnomByWv35Eehblu2uj1RM8PmO4yOudj4OA8MJFgKe+bvtpejN7gqFgDmgsjEUlJcHx fN2B88F2FTZSJ/Sm5P4hLLiyMFvCUTX/5ylnYjrn4h6ZuToS2qwMLYrOa321Zb0iENti FL340SkJrByqbnQx11LSIo2JfaJ9V3iWun4ek7cOcj1vlSUbgBd8y7ygwUf+L9XUBmSv Sunw== X-Gm-Message-State: APjAAAWVjSrB7rnaaUYltXX4duZjagfGJVlcH9hYyyAYgvKe5iqLAsn8 Ebw5qV0LZT3522z/atD0aiXg0z5M X-Google-Smtp-Source: APXvYqyraTVCiAwPVnWUIsMTntq8VwD6hzxSs9qSDZhxXoi/jB9rOdF2RhaEpkuYEFXIgM+MIEgflA== X-Received: by 2002:a1c:286:: with SMTP id 128mr2859778wmc.176.1576062861582; Wed, 11 Dec 2019 03:14:21 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id n189sm816426wme.33.2019.12.11.03.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 03:14:21 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Dec 2019 12:14:14 +0100 Message-Id: <20191211111414.27414-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <6236e1d3-4d08-2e22-0df0-db5785133fcf@gmail.com> References: <6236e1d3-4d08-2e22-0df0-db5785133fcf@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/apngdec: Return error for incomplete header 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(EIO) 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..65332c3fc5 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -240,6 +240,8 @@ static int apng_read_header(AVFormatContext *s) } } + return AVERROR(EIO); + fail: return ret; }