From patchwork Wed Sep 18 03:25:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15125 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 054C0449FBC for ; Wed, 18 Sep 2019 06:32:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D28CF6883B3; Wed, 18 Sep 2019 06:32:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D83AF687FA0 for ; Wed, 18 Sep 2019 06:31:56 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id q17so5211423wrx.10 for ; Tue, 17 Sep 2019 20:31: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=qt6lKPr2EJW+5TlZUx8k6kZ25+13SGXceU45uj+VTMA=; b=b0NlpKqFVOXASAV2PXbmLvAM6WrvMiGFl5V4QB0LNLEGh9CJc/Evl6dNbOjOtbPhxj E5hdse5EsIZA+bM9bfhOXEs0pZtpOf5eDIkKMF49esXiyH5c0Tu08v5wXlG/YxpafuiO yjGlKUgrCYLV7vzIimk0zw1ewzPpA0mYLKYfmYX+925Hr9/EmpuNlV2l4NSxO4bP33aG xmmDSY8N31sDFqqtXaOuzVf6cL9QwfUGnwKecMjpe4fbk6vSGvlaPtI1TWQMSlsxGOgR Vye1UTEmtxAffforqOQGxOxW8Rty0RdNvjd/ixZ8/JWVcD56IXTYYLU4uGJRkUF0bM8Q 2piw== 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=qt6lKPr2EJW+5TlZUx8k6kZ25+13SGXceU45uj+VTMA=; b=tKa6MsVJR86tUbofKzr6hv1Ej2F6oy+Hq12mtdHla27soge0wMJdcCzo7gcgOGbeUE M6sJy9UdzNt05qibZN54wkJq9ff4bgteLCyb/G4StK1DLjq1rrS+VNNGvNucNt0vOij9 bZCuTrSiepe+gPUr2DZrBl4I/orjIODhDxaeVlV4s6JLQicUnSN3mnJhJUNj2pLMoW8r IqC0OsmMFO4Nc5aKMGwcoXlMUOjVr9G4T0K/lsmvm1Vnw/voyFbAUnIekUELxEkxE3eR KoFH2xaJqkzdaiz4lZd826bBMNB0jITfAc0Otm/kWMTWVHQD7p49Il4y/8AYHKuoLBhq tQMw== X-Gm-Message-State: APjAAAXJbUFdUfoTLW1Sq3frQIPxfoKB1Iy9ABO9QUmnFOrUbvtL7pxD Wsq9UrsVxGYpfjIAgEb7u1GRo7mK+6Y= X-Google-Smtp-Source: APXvYqzHiLyUSCFAm7p6iK7zHaxDXCD3MtucbPmJCHQDvrO4y1uvEXRqYh0WNG/fFlhthCfWYPqMTg== X-Received: by 2002:adf:fe4a:: with SMTP id m10mr1103664wrs.209.1568777175909; Tue, 17 Sep 2019 20:26:15 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id 189sm806891wmz.19.2019.09.17.20.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 20:26:15 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2019 05:25:58 +0200 Message-Id: <20190918032607.11774-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10] avcodec/cbs_h2645: Fix potential out-of-bounds array access 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" The maximum allowed index for an array access is FF_ARRAY_ELEMS - 1; yet the current code allowed FF_ARRAY_ELEMS. This wasn't dangerous in practice, as parameter sets with invalid ids were already filtered out during reading. Found via PVS-Studio (see ticket #8156). Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_h2645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 8da8421e47..69e71a7526 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -748,7 +748,7 @@ static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \ CodedBitstreamH26 ## h26n ## Context *priv = ctx->priv_data; \ H26 ## h26n ## Raw ## ps_name *ps_var = unit->content; \ unsigned int id = ps_var->id_element; \ - if (id > FF_ARRAY_ELEMS(priv->ps_var)) { \ + if (id >= FF_ARRAY_ELEMS(priv->ps_var)) { \ av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid " #ps_name \ " id : %d.\n", id); \ return AVERROR_INVALIDDATA; \