From patchwork Sat May 30 16:05:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19996 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 2BDE844A6AD for ; Sat, 30 May 2020 19:06:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0949668AFBB; Sat, 30 May 2020 19:06:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C28E68AD72 for ; Sat, 30 May 2020 19:06:24 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id n5so7154636wmd.0 for ; Sat, 30 May 2020 09:06:24 -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=+Slcmqy90rOdM6ofrhyrDElnSc1XoOeISCAPq8TqAUc=; b=TzLuKlyHiWaejf6VpJjCFhI11uZ8dryZcEnGzASSmzl0HE5Sq83SOa0ehxMJYfzPyz iT16n5COOzya08ax2Fgf7TL0tb751IiweOQ2nEUmEj2WFvk7jvRr6wJEXgro5dl2SM2d VhfqHBgLXmW5bScbBSpWXo9ScqqTEDnu4Royt38SXOIWMyHwM3HYVvdRsI4vwdGmH1EQ WDnhdXNdE9WrJVZFL4FpcdJ1EVkTgDcnojS4qSAwh7IkUGBxop7NKU5eWTgmUmNXaBRj vsn4bDnxfrzgbck9vW9qxSb/WCTik2UxSqs3wDBMi6+WGJSwLmnviDpoZFuE+4JiRMK9 iQeA== 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=+Slcmqy90rOdM6ofrhyrDElnSc1XoOeISCAPq8TqAUc=; b=RqwrPtFgoyCjPnj0XHZCaHYQW1aaET1pYBwuh5ZK26/tfgkX8Dw93YhdSx5eVdMj59 Lv2Q+VZzUMdUmMPo4h4gQKRkXH1x3gw1xdoZvBiHosk1whP/2Ymjt3R48TTZ6kRnhx86 5ufhIB0wrDJI3U724D+6FWwrI2lL00bzv2n5Cq6axBuL3UhtJSOs4/jbTsmCOCje03SB ayXwTBMuhTx3KKp4QHwVkXIV3qwuUBIX6UGR4QvQjU8chpRJdxmxVCfT0NRxYnfIZySs A9L/TkCevKwRwFkrT++mQf5iVW4g/kuPm1BWkE/62zD+99o4Itl5IULMBKghC4Z8XJ35 yYmw== X-Gm-Message-State: AOAM530qCEgVIS7CEw32KXJXU43HA6n6fzU0enJ+QzZQj3WedJZLLIJF I6UD09Azm2+r5H40ORt4Rnh4FNih X-Google-Smtp-Source: ABdhPJzaf1GZsaxumRccz/U8nGNSbVA2D3A4byc0Kl+4XcOkw82Y4AhiDrvrv7BHWQwwb66k93d0Jg== X-Received: by 2002:a1c:25c3:: with SMTP id l186mr13855802wml.103.1590854783257; Sat, 30 May 2020 09:06:23 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:22 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:16 +0200 Message-Id: <20200530160541.29517-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/36] avcodec/vp9_raw_reorder_bsf: Check for existence of data before reading it 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 --- libavcodec/vp9_raw_reorder_bsf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vp9_raw_reorder_bsf.c b/libavcodec/vp9_raw_reorder_bsf.c index 6562399159..6e77816256 100644 --- a/libavcodec/vp9_raw_reorder_bsf.c +++ b/libavcodec/vp9_raw_reorder_bsf.c @@ -292,6 +292,11 @@ static int vp9_raw_reorder_filter(AVBSFContext *bsf, AVPacket *out) return err; } + if (in->size <= 0) { + av_packet_free(&in); + return AVERROR_INVALIDDATA; + } + if ((in->data[in->size - 1] & 0xe0) == 0xc0) { av_log(bsf, AV_LOG_ERROR, "Input in superframes is not " "supported.\n");