From patchwork Sat Jun 16 12:25:11 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: 9421 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1856358jad; Sat, 16 Jun 2018 05:32:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKn491kwlDnrUzoq2mvkcBm2pGz+5vbJS/J7qcRnz1ORpTxBBwbSHLnbHtu0Rlo1+6WlO1Q X-Received: by 2002:adf:8c09:: with SMTP id z9-v6mr4720400wra.142.1529152358400; Sat, 16 Jun 2018 05:32:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529152358; cv=none; d=google.com; s=arc-20160816; b=iJ9xmoYCaAWIvfM7tDeJZ5dxnB1wbvGZIAdTsHx4h2P4u1hPAqtzyF/ak8fPfQAeST tPUgs9g17Gwk41u2OqC+isdyXpPk9P5jF+5Z7Bn4zhbVG34K+yspawrixVAddmTJa4Os 2n5ww5O4Dy8PavvkpIOju3lentbhR4zfYxrLYMXbwnJ7P3HXW6Hr+IMJ8TWDZiGDYwMA JNU2qIHtrr7UMS2uEkm3rF1wXeTjVvMy0xDfwLYuZVY/TkE7st5IXhDaI3zom82KSaiz The2i52FgjMgYZ5NGiNkSdW01Zu/E9V4jr5oCxFKkIMOblTuTa2Z8j2XHr043yzh6bkQ DsrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=UdnCpnLgcr1gFQxy13Uph/0pdqNNyvm3RRwwoDN8NtI=; b=kclsSgFFL7YeOCblUGWMFxlF2+qqQgop+2k++3gkhyjdBUZexVrGpGCtveIzfqWu3R 5M+NcTJmY8l9gVHKQKTS2kyrmWTsKmIY16RszckYF+0C5m633bGHLzLDgqPt4o8sz/MW y9QEqiY2ctUK38mRP29SWUIUnj8P9vFqsl8v7zV2CM3icUW6FBgMu4nb8V/dLUlHNC7L YU5endxWXAhDE3+Lbu4BVdVegTAdRVkFO/X7KS1NHe0pGP2V375z6ItRr997BGS0cmtb 7Km3rK7PfpCsmlj6Q/58VTLczU2pbZ70TdBtzgus5t8hMxHDbuYy3Oy/wllbf1zt07x6 SA+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CFO747uj; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s185-v6si3489590wmd.230.2018.06.16.05.32.37; Sat, 16 Jun 2018 05:32:38 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=CFO747uj; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A50A689E75; Sat, 16 Jun 2018 15:31:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f48.google.com (mail-it0-f48.google.com [209.85.214.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9EB3689D45 for ; Sat, 16 Jun 2018 15:31:37 +0300 (EEST) Received: by mail-it0-f48.google.com with SMTP id 76-v6so6243487itx.4 for ; Sat, 16 Jun 2018 05:32:29 -0700 (PDT) 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=kWczNTH4VgEabn8dp7PhffnvanGEm7G72/IwJqdobQY=; b=CFO747ujjUTkX+I+XmK9vuJ6wDgZobomSqn/6J1Et/vsLnDkJtL7uLuFLQortg8ciA d7+SYg9/5bCjSu4fJhXGmPwIg9+OCrf7Cckt12U6sjusXZLwtKb09bsRvGpeVCpWJcgc /kHuWZrg/GFine9aOoMI/quo+LHRC+EirtrcVAr+DgY2QWZb61T4TT2SfgMJwTaJ6KUc 00nItI0vclpank+8HIMdrNdHgKEvdVF0VWYByrZJcsxucVM/3ZpooVhf9hcb9S3H80lI Ozi8wPNnE4TCyDEZNHOwbN0/9EuxpbrTho3EyccchMSMd0SQromh51RpvEKqzemCvhQY kwOQ== 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=kWczNTH4VgEabn8dp7PhffnvanGEm7G72/IwJqdobQY=; b=iK9PhiI9fBN75v4CM21lx+iA966mVk+qQvds+wQHjXsYgxbh7I5KiOKCNE+dTq9z+E Ne8ebndKIgCX2KoXMxAHEbivAxHVnGv7mrxXca716rOxOhA/wpYrYUimzew1VczUi8Vv 42VUUZADifrAtndSPReMA+gmznH8F6bYvGasRxJShdIuY+C9j/PF5PtahDpjhKF6AEgo 76uCIdvAXifhPzV1nnxJXfkiFNwT0BEEslyHe1Tr+Qmgwo9oAGJTFrAUJwkYkKvllo4r 524zWaJvTUbBPUHernzgapAhy3fsrmtIjUzmjpluYzAv163fqgR7KvAX99bE+pT3Aeq4 aRHA== X-Gm-Message-State: APt69E0ABNVUCDOsxS9aE9F4cO/AjKntnvuV+PpyYJ2P5YPgR9hJpUAc rF9l5M2KbSQVUiyl1i35xf82PKQN2054rhZqrOE= X-Received: by 2002:a24:d984:: with SMTP id p126-v6mr4365479itg.15.1529151911875; Sat, 16 Jun 2018 05:25:11 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:b09b:0:0:0:0:0 with HTTP; Sat, 16 Jun 2018 05:25:11 -0700 (PDT) From: Carl Eugen Hoyos Date: Sat, 16 Jun 2018 14:25:11 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/mov: Do not fail hard for truncated stsz atom 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 #6433 for me, this is also what vlc does. Please comment, Carl Eugen From adfa5858eacbb6210e5e9da20284b3a27523e5b1 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 16 Jun 2018 14:22:52 +0200 Subject: [PATCH] lavf/mov: Do not fail hard for truncated stsz atoms. Fixes ticket #6433. --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 0acf981..1011763 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2841,7 +2841,8 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (ret < 0) { av_freep(&sc->sample_sizes); av_free(buf); - return ret; + av_log(c->fc, AV_LOG_WARNING, "STSZ atom truncated\n"); + return 0; } init_get_bits(&gb, buf, 8*num_bytes); -- 1.7.10.4