From patchwork Mon Jul 30 23:35:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 9845 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp4421980jad; Mon, 30 Jul 2018 16:37:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfdSuW2jQFf6wqnxJu4CJeViCmlJ775Ryv51rvyXNZHEKI1E3e9NSJQVyUcWf0OhD+f1BQ8 X-Received: by 2002:adf:f790:: with SMTP id q16-v6mr11669736wrp.86.1532993879329; Mon, 30 Jul 2018 16:37:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532993879; cv=none; d=google.com; s=arc-20160816; b=wt2Q7wxJlH9xYHVrpTYnmblUitW7DSTTPvmPc6bvSHHyxb/T9Vy9VsESSBdLFEQKn0 19WlM2XUCBtk3A/c2eerCJDyBfiQKpSwzNKyFsqUbLWE7jaxOko/fsdLpqZEWW6CFgHP byBhnPTBKcJVAJaoOP8WhlQhR/yHSy8gibFhiIIX2K5X+sbtqLPeIR6kEySZijIPTMhK WIihhRFCn6HGHAqbE0D2C87hCO1P9n7w8VnsbAm6lyr56s50gWLw13CdMo1SI40PM80z 9eKZ5C7K9S+kAmBMj9ywaica34fLrzwTK00MzNzusup6WbJlSgnpwaqmnoNdCs8dY/VS GFTw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=cPP4OYGVGJN9+hmzqVUg0tepFvUpSjuCem/p0fvBjVE=; b=fMr++CHiODAV1XLDtIBK2Pm0MzZNXjlhxB9N4EBNEprl0jPi0v+a/F/S+w2irE5qAU 15rh/SsFhE1dufDB5MsxQNb5fPon/NkoHDbYuNx3Hy4cFLyevBIMH8sS4JMe22mryE2/ HGelXXwFp8uTbcceTffBvPz+58NJSDHdFq5AhZvW8jsgSTX6HPaVSEjZpyTBbN45OTo+ d8FTQQcFgABLKW+1wkc03Pqy4pwKVj7p2Kb5Nsp8nNbWw8T/EqnEe7EjeVh2vm6cSaxN PMLo6tjXvalg/wng6x3tpgcH+MdM+f/ymFhWSdDu7sIg2h7sl99DUi3hhgRl2sq+GDOc AZzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LMYDLFB8; 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 g37-v6si13452960wrd.260.2018.07.30.16.37.58; Mon, 30 Jul 2018 16:37:59 -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=LMYDLFB8; 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 1296668A277; Tue, 31 Jul 2018 02:37:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FE61689B55 for ; Tue, 31 Jul 2018 02:37:33 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id y5-v6so14047428qti.12 for ; Mon, 30 Jul 2018 16:37:50 -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; bh=Q3zaRRhi9Gw4YEYlGxHgwlxKBKISGzKojncDjmJ9OzE=; b=LMYDLFB8gM5AM8PeyM2Rjdp0GmecXz4V2zbx0X81NmS6VlakLm3YRsSshTLN/ofMNE E8T7YFtvN3rpt8xz/Z9sRxF0vUFJCLn2+1QXqlgZ9ZF2ux9WKgkk1OxisJsmT4cYXA3j +HezejDDaCsP7h9dJ/sPDV66ZHa/RPeouZlS4/CGk2bN/GncxD9aKxP8vn6GiH+31FbF Hc3vGd5cy9aF610yQJVR7g2Fb51pJBK9j1KwDrOpaoIapVwuCdX/Xkcob9tkLWZjFL/p NlZW4DDewEuJhTyX6bjG1+I5TyDZdTlbsUr2GhoTVOfB2f/6Ybr1JLpL+82mRBbBdZoI WQXQ== 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; bh=Q3zaRRhi9Gw4YEYlGxHgwlxKBKISGzKojncDjmJ9OzE=; b=Dlpu6cg7FaWZIGxuo87AcNvBDQ4V864kqhUeJYGLg6+9K8cWZNi7EBMVjdZ49DO2ps Qq0p9A51fKPpWq3iwqv0QedQk41qrDsOZlXYBFMVnfw55QLAZqOuPduhd+1Om8O8LCE5 fkR/zeJTQrmuG8Gv+VGMaIpZCUw1B4sbZAKiXXGxwuMXu8fsnE3QvH76fpRMM9a03k2c YStaQZoZEDM5TPIe9m4RwPD/n9FtUAyhii2Nmx2MEW8Bg1ooRLJs2ALOQ4jMojLK0IAl Hm1eSIKcccGU+4C2foxacfr+PswaylxK1e9p+/DB/LhDFpEk7pagjMaOyAhwLmVpQjCZ UaYA== X-Gm-Message-State: AOUpUlFuSq+LfEg8eE05oJGOlbsqRyJvjfS2a+LCCvNUtpnLiDq2FJwB v5Ai+AYz96K/AhGOuRO1qw1BTwI+ X-Received: by 2002:a0c:d5b0:: with SMTP id g45-v6mr17015295qvi.162.1532993868799; Mon, 30 Jul 2018 16:37:48 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id k190-v6sm7436435qkd.27.2018.07.30.16.37.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jul 2018 16:37:48 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Jul 2018 20:35:39 -0300 Message-Id: <20180730233540.11100-1-jamrial@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <542145de-a22d-2eb7-2148-3f8a16c358a3@ycbcr.xyz> References: <542145de-a22d-2eb7-2148-3f8a16c358a3@ycbcr.xyz> Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/av1_parse: return size of the parsed obu in parse_obu_header() 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 --- libavcodec/av1_parse.c | 6 ++---- libavcodec/av1_parse.h | 8 +++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/av1_parse.c b/libavcodec/av1_parse.c index 48feb9fb8a..b1da44ec72 100644 --- a/libavcodec/av1_parse.c +++ b/libavcodec/av1_parse.c @@ -42,12 +42,10 @@ int ff_av1_extract_obu(AV1OBU *obu, const uint8_t *buf, int length, void *logctx obu->temporal_id = temporal_id; obu->spatial_id = spatial_id; - length = obu_size + start_pos; - obu->data = buf + start_pos; obu->size = obu_size; obu->raw_data = buf; - obu->raw_size = length; + obu->raw_size = ret; ret = init_get_bits(&obu->gb, obu->data, obu->size * 8); if (ret < 0) @@ -57,7 +55,7 @@ int ff_av1_extract_obu(AV1OBU *obu, const uint8_t *buf, int length, void *logctx "obu_type: %d, temporal_id: %d, spatial_id: %d, payload size: %d\n", obu->type, obu->temporal_id, obu->spatial_id, obu->size); - return length; + return obu->raw_size; } int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *logctx) diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index 3a4151491a..9a6e6835ab 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -95,6 +95,7 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, { GetBitContext gb; int ret, extension_flag, has_size_flag; + int64_t size; ret = init_get_bits8(&gb, buf, FFMIN(buf_size, 2 + 8)); // OBU header fields + max leb128 length if (ret < 0) @@ -124,7 +125,12 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, *start_pos = get_bits_count(&gb) / 8; - return 0; + size = *obu_size + *start_pos; + + if (size > INT_MAX) + return AVERROR(ERANGE); + + return size; } #endif /* AVCODEC_AV1_PARSE_H */