From patchwork Sat Mar 16 10:22:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 12323 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 3E0C74487B4 for ; Sat, 16 Mar 2019 12:22:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28F8068A702; Sat, 16 Mar 2019 12:22:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f172.google.com (mail-it1-f172.google.com [209.85.166.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7623689A0B for ; Sat, 16 Mar 2019 12:22:19 +0200 (EET) Received: by mail-it1-f172.google.com with SMTP id z124so14805018itc.2 for ; Sat, 16 Mar 2019 03:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=izz8zeXg01yJBmdX+S/nGqymPPtefWIAzZDdeD56Ygs=; b=KZalSWJKkYC3fO6YqSg2YYrY+4vlUreyTVKdt3SpRgPz1+3UgFPeRT0giIsVLqVDpU KYgaxc0qFFxIVSPRHHGXBt5NX8hWAXWz4JLx2TiIrKucu1csZsFHfyXDmBsEUKRQp6DL 20d2vdvxdG43MIm1fS1yCjuRiJyJKFdpaL9BsJrK8w6gGF8DGfTuvCggmiKBtIP2Cvke 5vW/khEb+VRQ8xQklEqXu+GB5EMFTHZjs+e8FXkbsSu4fa5JZQv4lN0tlrZZkf7iBFVm De56pG4kHsRpM+QGpaUN3aaknah7CoaOKY+EhNUgS9a4f1Idti2Qtic9U2ojxQfl5c8E vOJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=izz8zeXg01yJBmdX+S/nGqymPPtefWIAzZDdeD56Ygs=; b=uKF3oNxrkNBPc2k4qk5Ihe/vw2SqnFg3x+B4OZXmGz5hIQK+Z28dWRKlKvdr1cCVvF 6Ii8sipfE/v4LXDbnlj7ITCWxjyfqKfAO1jEaFOzHZLbzuCMp8WrxX9aSYyF+gmfiLCd +KRQE0njCfw+ZoQ/F/eUKBay1X3eFEClq6VMqIIunaHqHTNURBxVXuPNNA6iGzw+WZqA EbjxfWx2xd1I6dx/yr+2FCWZv0iyxrqC5nrQ6S5aqmXfa6VVD0B/cYJCiGbFjOTEGfZc vc3ITrfvFKb3IrjYA74kFFKPY/918baTKAd8a9QceeZQoW8+fiynWgdgQli3rCsgYB7f OeZA== X-Gm-Message-State: APjAAAXL/RXsXnOiNEcQ8oyTw1y6vOF9V5FtebhPSLzjuu8OJ3KIj3CK eINo4LHcQ9K7o6+g5EM4wbiiZnzg X-Google-Smtp-Source: APXvYqy2OBxIHeK3EhOm60Oo/kEMCBZb0+DxEqa9Gm/qPiu12d7+EfUAheY4/pU6Qte7ntf+uTLjdQ== X-Received: by 2002:a24:2487:: with SMTP id f129mr4829013ita.124.1552731737953; Sat, 16 Mar 2019 03:22:17 -0700 (PDT) Received: from MacBook-Pro.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id l134sm2270539itb.12.2019.03.16.03.22.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Mar 2019 03:22:17 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Mar 2019 05:22:03 -0500 Message-Id: <20190316102203.69741-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190316102203.69741-1-rodger.combs@gmail.com> References: <20190316102203.69741-1-rodger.combs@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavf/movdec: use a more appropriate error code for bad trun atoms 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" --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 0dfee2e7c4..9ed109962f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4785,7 +4785,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_ERROR, "Failed to add index entry\n"); } if (entries <= 0) - return -1; + return AVERROR_INVALIDDATA; requested_size = (st->nb_index_entries + entries) * sizeof(AVIndexEntry); new_entries = av_fast_realloc(st->index_entries,