From patchwork Sat Nov 25 18:54:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6356 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3754412jah; Sat, 25 Nov 2017 10:55:48 -0800 (PST) X-Google-Smtp-Source: AGs4zMZzWCRUWKltM4pg1GnjS0aROo8KlrNx3dBPJYPY4OT0PDJxwkQefH4J46DEqJ49EeUShvGB X-Received: by 10.28.47.68 with SMTP id v65mr14249763wmv.11.1511636148706; Sat, 25 Nov 2017 10:55:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511636148; cv=none; d=google.com; s=arc-20160816; b=gnGO5lPcs2nT+R/dz5k9d31OE1mFDiHJhdaJjH9QipLK+Z2UpJmSQMBf3W+tYySPTj +g96PgONPQJCYXV0IXpcnaOLxqpy5GZHS/KpSk0pN2q3C3pdvfUSg9qvVjoCxzZtampq Hnn3tYRdu4GLKtAMYiopP70Hv3/B9GG4Gi01PLbLVhwdZacnIR7gjcV5DX2X2SbHPbJA 46fn+rk3FDeAV8Rg46FNOiOYgIgW2UAPxhjCchmF83w2NRxKbxT4eOP5BWRTND1v63po 3vWIhQ7NdVDDGPTiz+rMJ8nB1bxD2rQj7c0xdVLdDrQzE4rE80nUJJu+6SRwrYBI98SF S/HA== 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: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=YIctXkpM9475DCSyOePWK/S0Id0I6+bTgkdC+2xyE5o=; b=TEY5MIh3pdsJXQonJSijpmBNwlmTRDkRc+LpCzWTesJ804QjKddLiYRQwbWI32L8br jnRGBFvdwUYSo1D1Ly5y8yc0JCyalAsO+t7Dsvw5VapmlxYOx6KCQrhcgrUtD2ryq8BV tNTXU8tJ9S+FFyDRwkV9grNm0buR076V+UAEMkoveKM9KU1WGt231pLB6QkB6jgLx5n8 Po2WLWVXdk5Em+wkcJAdOSIJDpiaNdA9huKhYDzALdEMZ1yIMt3YUnZ6g6jlbVxQpfgz f/eu8G/va5rRzpA9qaYXsyqHkvJEZMDKrvBQjoYjK4IcR1Jm7M7ee8rlK/NycOkBKFLZ YJ7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EaFmD7yC; 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=NONE 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 q203si9004300wmg.153.2017.11.25.10.55.48; Sat, 25 Nov 2017 10:55:48 -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=@gmail.com header.s=20161025 header.b=EaFmD7yC; 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=NONE 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 09B5068A339; Sat, 25 Nov 2017 20:55:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBC3368A2A2 for ; Sat, 25 Nov 2017 20:55:39 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id q13so23314962qtb.5 for ; Sat, 25 Nov 2017 10:55:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=rQaU+s1JyfahqoHcKPIm3vaAW4gQ/GJicaAU6WzRkOs=; b=EaFmD7yCQ5HvraSs6rfoxty/JBBCRzlJMjDWrIssG/C6Tdl/ZCyZZxovjvmXD+qs28 2IpsOodUfP2qy4ZhjI5s+VNo9/MkwHdSaF2iZMxu7NJXyOCF11YEnC24C/eVZZESvmD7 p/4MO0jc5g7flQZ5fg+8Ll5iwcXgzKiPrhKBf+YXOtkwQgMiO8jsmEg2mtPQJQg8ljJi m3HH3tF0vrXrLr/ag400d/5zbte6XPp/0QEiE+eWwdhnHdXGQfw9OYjEtCeZfHE5ckJw cPnUncgCcih7A+gXHtviXp4o8CLYwk0DA1Kf7KPl+K9QEgmYlSL9Rdb8P60TukXJ/OaH zGIw== 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; bh=rQaU+s1JyfahqoHcKPIm3vaAW4gQ/GJicaAU6WzRkOs=; b=hdjlqDaJY/kdggD2YZQLBkLdEa+oOv6NuMXa3cbbtt7EIZRny2ibpJ/f8K1PCnOpmt D4BmOonS++Kk+2Sh/y2BOPyFvTwTlUOiSZtv7lKD+nNJRl3MszJF8TDb9EmYa+7FhQhE uTO7PgCoXeB8mLgO/9dPcJr7rjriJAfIYnMCWFJiRx7Wrg1ZT8qH5B2RBwYrFh9PuL4s E6ltrAGepC3wFzJKqr6IeU+4KZnzKuxqQhiyqDht07FXmw4jIDpIjVTCwsT6o9NGKnD8 HvJj8SDoJuJVnVGjAB7wQRxAHO5EtQ4a/YQ2efvFWtRahXwVDxplnbGDwhLbZVAPqqxg LdzQ== X-Gm-Message-State: AJaThX528Lf7rTpfgAlKiRptQzezUhHWuSaW0qPB2s/HkkSXIi3l1tzE szChV2OmiVp0nKT+VSOBxF3nDw== X-Received: by 10.200.56.137 with SMTP id f9mr48114810qtc.116.1511636140148; Sat, 25 Nov 2017 10:55:40 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id x1sm9761141qti.91.2017.11.25.10.55.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Nov 2017 10:55:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Nov 2017 15:54:56 -0300 Message-Id: <20171125185457.6860-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/isom: return proper error values in ff_mp4_read_dec_config_descr 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/isom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index 77983c5eaa..9d9f85885b 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -524,7 +524,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (tag == MP4DecSpecificDescrTag) { av_log(fc, AV_LOG_TRACE, "Specific MPEG-4 header len=%d\n", len); if (!len || (uint64_t)len > (1<<30)) - return -1; + return AVERROR_INVALIDDATA; av_free(st->codecpar->extradata); if ((ret = ff_get_extradata(fc, st->codecpar, pb, len)) < 0) return ret;