From patchwork Sat May 30 16:05:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19988 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 2851544A6AD for ; Sat, 30 May 2020 19:06:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC741689EA6; Sat, 30 May 2020 19:06:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D3A6687F99 for ; Sat, 30 May 2020 19:05:56 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id r15so7112659wmh.5 for ; Sat, 30 May 2020 09:05:56 -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:mime-version :content-transfer-encoding; bh=OYrpX7tS9xq5ak4LoJZs0Rsj4m8AOpDPb8zpPXCj4H4=; b=tZMffwXw9EI+hgwU5Oxuawe7VJ1139gnWi3BU1TijyUIizFN1rvvI62LmzgEDGBmMz +NNGnuI634LzjfPg25M37KtJVNbaeWj8KP/Q0P2JCMGSO2GipPV/Voagb+yzDEAdiqT+ 7um62VpCMA4GEbwcUPHJIM60BuRe21DlBb7f6kB2OL7aQEVOTrf1Dy+DJapwhgvWgJdE e6qEWIYtZg6aOhow7VQ0tnEeYe+Vhzi9ND7TR1Biyx/jX3gBnUMVx2zLgawPIaE0lfvE V8UD7zcK+gWgEgzoaUU5uX8+w88ZbQQywFO9oFs/Hw75Oj/Y0GccnCHlS1UC+R1ugE/o MlvQ== 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:mime-version :content-transfer-encoding; bh=OYrpX7tS9xq5ak4LoJZs0Rsj4m8AOpDPb8zpPXCj4H4=; b=qIEduQF29UI4oRswBT5WmwGeAxf/rgZkx1ItX4WkcZ6wHvjUoXhF33pRt9R6X82ifp w7KAwXlgNb5LjY+5OQqQtUddJB+NvUVXqt9tSY6iKHOPZn9fI5bI9RbG/flExh+SM4D2 S2j36Fc4WzEc1Rt83NmeLEdu780K5kC+ZKNK5YsgPC6N3m2FoKPKmDI9toqyFbbDFkaB BgcfOIjSlgMBeFEQL+HP94Q33UiPcBkTgBx32dGcxkjMfF/00xlzpcNGh16OICMMMHAz qBv2mGwJZd+8E+SlvXsD4UXl7kikFdzVneSndAYBQRdOOiKQcPsLHrqIV4h2A7jWFoj9 sZow== X-Gm-Message-State: AOAM532YaKEYRC4W1mY0PxKWNeEb0u+A9MXLWFf4EUA9ChKFlPTT7UGk NX/+ID2e8iS7CDct1qPkihp/tccT X-Google-Smtp-Source: ABdhPJxVpJDwqEFBl2I6VR+/Z+s0fhtKX2p02DLR9P96lNGnTUeqSWNYUBk7YQgm3qn6rSkGWaV2qw== X-Received: by 2002:a1c:1904:: with SMTP id 4mr13219262wmz.125.1590854754515; Sat, 30 May 2020 09:05:54 -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.05.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:05:53 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:06 +0200 Message-Id: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/36] avcodec/vp9_superframe_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_superframe_bsf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c index 57681e29e4..34a47aa69e 100644 --- a/libavcodec/vp9_superframe_bsf.c +++ b/libavcodec/vp9_superframe_bsf.c @@ -108,6 +108,11 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *pkt) if (res < 0) return res; + if (pkt->size <= 0) { + res = AVERROR_INVALIDDATA; + goto done; + } + marker = pkt->data[pkt->size - 1]; if ((marker & 0xe0) == 0xc0) { int nbytes = 1 + ((marker >> 3) & 0x3);