From patchwork Wed Jun 19 23:45:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13617 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 226F74488E7 for ; Thu, 20 Jun 2019 02:54:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09AB168AAD0; Thu, 20 Jun 2019 02:54:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAB95689F2B for ; Thu, 20 Jun 2019 02:54:37 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id s15so1238632wmj.3 for ; Wed, 19 Jun 2019 16:54:37 -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=ZYOWxSuP5oOkN5JGswsVWdgVlQtWCcDKR6iTHMxohzU=; b=b/rB3/pmekN9Mn4ElKtdP3ITPBuGD+jOi+uivbD+koVw7lg1O1Y5qWkOeyrhIxmpzF bbkWmdgH9mjFvh7GT1dLWy0P/73Xm02Tp3ZNnvqy6Q3ZyAPFExvCu0qqOyNYlElyFioI jRB7BjyL28vmbxg/8JlAmqQ2VLJx1HmCn7rJEqyQMZwZhidIwYDaR5kcRI5w5xkzik1X AQiMONjqUzW7yrxwrzCS8UOCwKhjLgjy5u4lxKAS1NT4LC21HLEQdPx9FWxFPzhzd4Sc KJVBB38MvL6mvfboTmhKHgwETapJUQPfh6yTsx9liF2Y6aOqmYVWZTCfPGVOqpXdredy rxyg== 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=ZYOWxSuP5oOkN5JGswsVWdgVlQtWCcDKR6iTHMxohzU=; b=j+ievYVVEkdGy46piQIm7QgYLu3skjsCcF+ymknDo1Pk/8HmCBP2ElwVrtpR0xpzCp KlCO2PP+pdPk5vSiPOEMncDtBfYBh6NOa+6UALluHPFvShsv6ogXwcX0N0w2BPV+/WMY GrXZ/5hGg92Sbk6JH5Jm3LcHL3SV3OzwJJ9VJx4OKdr17k2KqRgNDaOIVTOxrBTjaiOw jTz9tgLF9ZCQgw3HkxhY0Tgvi0LpclBdcpvNM42Aki+UsxWlBLW8Oivda119nb2JmBBx h+f1GHehpv7JY1BgaWJSCdZaeKS393f72rdakInUKbGXZLVqfroOWm5ZZay2OTISKv/b Bw+g== X-Gm-Message-State: APjAAAVObdU/Ly8ZqK1GG4kCCDwRE8D8spwLhju3IC5vJQKEe1pzMfU8 tLbji+2cM8f400CHh7UhieBHzVRZ X-Google-Smtp-Source: APXvYqzEK6LtXtcbVm4ktCxIPjS8IZqVCFCSs0TkWtHaOIPIqyfAkND1cvonsc6M7i2RUtGDlAE3qw== X-Received: by 2002:a1c:20d0:: with SMTP id g199mr9830082wmg.79.1560988477127; Wed, 19 Jun 2019 16:54:37 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id t63sm2758989wmt.6.2019.06.19.16.54.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 16:54:36 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2019 01:45:00 +0200 Message-Id: <20190619234521.15619-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619234521.15619-1-andreas.rheinhardt@gmail.com> References: <20190617034223.21195-1-andreas.rheinhardt@gmail.com> <20190619234521.15619-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/31] av1_metadata: Error out if fragment is empty 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" If the fragment is empty after parsing (i.e. it contains no OBUs), then the check for the type of the fragment's first OBU is nonsensical; so error out in this case just as h264_metadata and hevc_metadata do. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1_metadata_bsf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index 842b80c201..bb2ca2075b 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -133,6 +133,12 @@ static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) goto fail; } + if (frag->nb_units == 0) { + av_log(bsf, AV_LOG_ERROR, "No OBU in packet.\n"); + err = AVERROR_INVALIDDATA; + goto fail; + } + for (i = 0; i < frag->nb_units; i++) { if (frag->units[i].type == AV1_OBU_SEQUENCE_HEADER) { obu = frag->units[i].content;