From patchwork Sun May 17 23:13:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19728 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 5DD2E44B429 for ; Mon, 18 May 2020 02:21:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42EB6689AA9; Mon, 18 May 2020 02:21:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EDDC6808B8 for ; Mon, 18 May 2020 02:21:48 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id n5so8336632wmd.0 for ; Sun, 17 May 2020 16:21:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YUlRgWvgAgWvA4Y/ToM4lS4AS80UcSsyQiTNHAfAtdw=; b=pekjk3we5tNv2mea5JpauvP8Ta1WG/iGFsvomgbMZAMH1t66VTduy59owCz1nRSHdB 6a8ZQN9fnsxPUAG0xE78rs3zmnefLQlpKI/R4Gw+bdtqwh9gSzQMmXuYdSPA9svKIMcB FATFvkDMbpveusfpu9gYkABUsB0tY/tdaMk4DGABm/C94sXbYoG7euXXSnr6lobBYvwi FM2KaOKdkRwgjHl3R6ihWApTPBdHYo07Iim0rGvRuRo3jOo71g45gyGc7KYkvO83qV4H bjbrYopVNmLCajkaDP9aAbpmHkKp4A8OxXUsawdIA+pgRoHg7zXNGABDIyngduH6s6wB QyWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YUlRgWvgAgWvA4Y/ToM4lS4AS80UcSsyQiTNHAfAtdw=; b=DOjQDmlSeH/ZBCa0A7FBzyGQlmqZLoWlZ5D5LZ/aAnjOlkwOEzVgxDzNdDwy2aQDAl eorhCEJsCbkxtVJPbdXWzzM8cMvQZQk9GWCWPWfLVxT86DtF8RiX1ElWmim+4HbwDN0B qYdGzlEKlonl2R7hDYmVNJqbGWCQQXnfiIlJIbsFSf/IUMEZIh+/pu7g0ho+HpQ7IBXH ZF6TTUX4kbtOjQ8M6/9TmP3C+Y8kJVC/ShhYKBIDbjFG01VyZMeUwl7ovRpsFAjw+Nkz xhj0rJmuCsYOm2t3VkYD6/0L3o3d+VHTJz2YcUZ43fJwALgPbNnSW/Drtn6GXzrDJ5pO uZ6w== X-Gm-Message-State: AOAM5304ElUhaieWJFEeBksDfQfljnUzDNP0UJMZQoV/XBpX+GUUq2jF Knkt4Q7Lax7fXdACsN1zymowNm5u X-Google-Smtp-Source: ABdhPJymu4UVFN1MOGMzlX/hrEpBtEmE241Aa2nfoVyGeWybwH1N/l4tlhHqt3UPqWrPlxoXaEgf0Q== X-Received: by 2002:a1c:7407:: with SMTP id p7mr17041338wmc.114.1589757230640; Sun, 17 May 2020 16:13:50 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:50 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:17 +0200 Message-Id: <20200517231319.13067-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> References: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/xiph: Return better error codes 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- There is another "return -1" left which might either be invalid data or an unsupported future extension of the format (e.g. one that does not have three arrays). I left this as is. libavcodec/xiph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c index d072224b4a..3073315e63 100644 --- a/libavcodec/xiph.c +++ b/libavcodec/xiph.c @@ -35,7 +35,7 @@ int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size, header_start[i] = extradata; extradata += header_len[i]; if (overall_len > extradata_size - header_len[i]) - return -1; + return AVERROR_INVALIDDATA; overall_len += header_len[i]; } } else if (extradata_size >= 3 && extradata_size < INT_MAX - 0x1ff && extradata[0] == 2) { @@ -50,7 +50,7 @@ int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size, header_len[i] += *extradata; overall_len += *extradata; if (overall_len > extradata_size) - return -1; + return AVERROR_INVALIDDATA; } header_len[2] = extradata_size - overall_len; header_start[0] = extradata;