From patchwork Wed Jan 25 23:34:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2310 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2442265vsb; Wed, 25 Jan 2017 15:34:32 -0800 (PST) X-Received: by 10.28.182.70 with SMTP id g67mr25449142wmf.131.1485387272471; Wed, 25 Jan 2017 15:34:32 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z139si758716wmc.8.2017.01.25.15.34.32; Wed, 25 Jan 2017 15:34:32 -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; 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 7242568A5ED; Thu, 26 Jan 2017 01:34:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6695468A12B for ; Thu, 26 Jan 2017 01:34:22 +0200 (EET) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cWX54-0008QR-69 for ffmpeg-devel@ffmpeg.org; Thu, 26 Jan 2017 00:34:22 +0100 Received: from [192.168.1.3] ([80.110.106.213]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id cnaL1u02c4cGVTk01naNur; Thu, 26 Jan 2017 00:34:22 +0100 X-SourceIP: 80.110.106.213 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Thu, 26 Jan 2017 00:34:20 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201701260034.20878.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/mov: Ignore avio_skip() return value 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 fixes ticket #6102. Please comment, Carl Eugen From 694daed9222e50d6245bf5d041e82523ee869451 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 26 Jan 2017 00:32:23 +0100 Subject: [PATCH] lavf/mov: Ignore avio_skip() return value. Fixes ticket #6102. --- libavformat/mov.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 7dc550e..6f7e80a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4794,9 +4794,7 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_free(buffer); } else { // skip all uuid atom, which makes it fast for long uuid-xmp file - ret = avio_skip(pb, len); - if (ret < 0) - return ret; + avio_skip(pb, len); } } else if (!memcmp(uuid, uuid_spherical, sizeof(uuid))) { size_t len = atom.size - sizeof(uuid);