From patchwork Mon Nov 27 03:13:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 6386 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1161818jah; Sun, 26 Nov 2017 19:13:19 -0800 (PST) X-Google-Smtp-Source: AGs4zMaNgOnra+hyxiN63XUe/YKB9gnLOj+QcPevBMlWhbDcjzVbAQ7B9CcNd0/szjy8w9vGIKi7 X-Received: by 10.223.130.205 with SMTP id 71mr14890873wrc.101.1511752399275; Sun, 26 Nov 2017 19:13:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511752399; cv=none; d=google.com; s=arc-20160816; b=G3eON/7/9aCFkfGSoHkOOtJf2NsCYP+bLl+hRZtICnx4gbbp+lL9t4NVitLLWOVnv1 lSrb/MpSb+chW4d82NOQIeQz2tdTiStcZTOLZYFI8uIg6HAMti2i107XgGc6wd6lVDjw kGxf/FpIuw9t3UrwFn7g2zwbvfwzT7dRX0gTyFHncevcB/zluBT/vYg+J+TQirPzX/pm ZAenhXnFavGgpMltPjD2UGd2+hfUo4slrTrOcYv9W2rlTipAXsONkv5sdV19lGVJKEMl KHHnZHAWgCEb3JYgGtiM560XK0pOF1b3cjLW7yfZxoUXEKrryCCAmgn06uJAi4oQNnSv yviQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=3/OH91OmIhUcoR3MPGPyWFD1r3ei2lNKoKROmPV9YqQ=; b=FaiUMfKClLVqfBtp/twJYGmtffNv7mOLD+Z8YskuSCI0RaiFaKQzU2mfbt5463aL/Q 0+xZHeq/1EJRyJDVhU89UZQLJzlSO0QaGxZ+tOR8fdXF58jx+7GTAmE/wSoAeZI/EaxF xstbKp7OSjBR0z9XWhfE89AmvbvJF5rgzcgTmtsJrbnERqt6FiACSvfOUMAsoAU+lndg lUhV5Jv8MjIqy3TDUYvdSXgVs5IPwbJXI5Rgd2eIEPtRAYo5teb8r2IXnHgjDQ1A/bn4 qhdhc0O++/QuzP3G5pGh9OmNLPjhFEXFZ5wOFfhNf446ER4YOQ7LIdtPSrWrE94v4EF3 r3RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b=JjkrWlmc; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t135si10500860wmd.247.2017.11.26.19.13.18; Sun, 26 Nov 2017 19:13:19 -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=@163.com header.s=s110527 header.b=JjkrWlmc; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 447C868A113; Mon, 27 Nov 2017 05:13:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-16.163.com (m12-16.163.com [220.181.12.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6763D689FC6 for ; Mon, 27 Nov 2017 05:13:09 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=PqhnH/8OMbudyBVBAy ZQ0gUGYfOjq4BZCsstPvGbqpw=; b=JjkrWlmc7Ay/9f26M9wkHNiQ0dztDCV4Hb qGF8O0c2cnYr8tydQbwuce7PU7p39npoH4X6GGIWQ3d0qc1txf7FM9T0MQB/I7cl OnhoQfvtunRsAI+gz5OzwMHKz3YZf3giizzvGzBRwERfkdDh9hRIFxDvGNIzFtZw u40d44tLs= Received: from localhost.localdomain (unknown [106.120.213.112]) by smtp12 (Coremail) with SMTP id EMCowACXyTzCghta+irIBQ--.4301S3; Mon, 27 Nov 2017 11:13:08 +0800 (CST) From: Pan Bian To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 11:13:05 +0800 Message-Id: <1511752385-25288-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: EMCowACXyTzCghta+irIBQ--.4301S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Jw1UWr1kWryUur47Cry7GFg_yoWxurX_WF y2qr4xX3yv9ay3Aw429ay5GrW8W3y8AFZYkFnxJrsxtasaq398Zrn7Xwn5CFZ5Gw17tFZr K34DAr1xJ3W29jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8ksqJUUUUU== X-Originating-IP: [106.120.213.112] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBUQSdclaDwFYo9wAAsm Subject: [FFmpeg-devel] [FFmpeg-devel 2/2] avformat/mov: return correct value in mov_read_cmov 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: Pan Bian MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On some failure paths, the error code is not correctly set. Signed-off-by: Pan Bian --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index d25071b..bbf550f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4895,6 +4895,7 @@ static int mov_read_cmov(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (ret < 0) goto free_and_return; + ret = AVERROR_INVALIDDATA; if (uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK) goto free_and_return; if (ffio_init_context(&ctx, moov_data, moov_len, 0, NULL, NULL, NULL, NULL) != 0)