From patchwork Wed Aug 5 23:33:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21505 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 D456B44932F for ; Thu, 6 Aug 2020 02:34:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A970568B9C3; Thu, 6 Aug 2020 02:34:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A137768B84A for ; Thu, 6 Aug 2020 02:34:09 +0300 (EEST) Received: by mail-ej1-f48.google.com with SMTP id d6so34422384ejr.5 for ; Wed, 05 Aug 2020 16:34:09 -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=qgtQaN3JwNgaq7TyTxYurDS4B80b3G3HjRZZmzjYFWY=; b=dwjM/uaSnWUzMLc5xIUs7TNhpBpuhfNPNJH2zIyweVjefFP5yU6IODlgr8YI1AC63P YLewusisYm1n0V9+/qrPrGe5qn57Ry3FwHp+ofDLWlWCf/3vWPmhTKsnpw/AQzkKBmr4 AzTOc5ouvTWhJ9i0FeFoSsbNJpRkrHjS297cFs+QH5rmyu3twpKZLTqL6XYN+7Jk7Kkf fBMhO7bksdoGIau9EAsny6yKlLx8KK7zyBopnuuqXz23rCKhY9mylnB2+jIkKsgBh7SS hu/C5w3RFx3Edu2FzUJJHIr+DtZ1G0B+YZhuT4mF2OAjiOgKquPpu7BX72ftR7m04PgM XvrQ== 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=qgtQaN3JwNgaq7TyTxYurDS4B80b3G3HjRZZmzjYFWY=; b=HPYAxvzejkFM1aJ6VYT/EryVLDJHbHlOTNswhxx9uDfOMR4DC7dYNHGqyIdsUsH3RL hUSGWXOwruUnKbMtVoCSFqVbXq2OnviiAdy1W8HIZyV93rQtc8sMNHUuOVeQTcu1UO3h VQS4HcwxNZMrN7IxjS47d8N7eDJR3k/7vLw2ttpJJ4xJYsYV5aZ8ZURMb7qALfrtEJnl eSRHfUArbNge3yjt6/LCekxnm6E1uLRtk0NwiTpq88JBi78ZsuwIWthEo2FNZXMuw6ra GWNgWy/Oxw7m1jaaXlJ3LWilzlAZN5qQH8XxxT09G63CkfjzchJ023f0CeXsEl9GYLA7 UJ+A== X-Gm-Message-State: AOAM533lHJ6fKI+LjCs+JhhM28JSdOy8C7yDSz0zSOgAz4EddCA9mvni 0iW+SZlF6L7SYBBqaA7+4i1LcrVe X-Google-Smtp-Source: ABdhPJzmfMSOkqud60nRsn1+K8usajVEbSsoCUnqvfrao0vUL8hBQl5c+9FD9VTTLwLwZas3iTdXGw== X-Received: by 2002:a17:906:68da:: with SMTP id y26mr1659053ejr.250.1596670448716; Wed, 05 Aug 2020 16:34:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id d19sm2447208ejk.47.2020.08.05.16.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 16:34:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Aug 2020 01:33:56 +0200 Message-Id: <20200805233358.31711-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/vividas: Check return value before storing it in smaller type 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 --- libavformat/vividas.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index b0f9f35ac2..708adc8801 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -432,19 +432,20 @@ static int track_index(VividasDemuxContext *viv, AVFormatContext *s, uint8_t *bu AVIOContext pb0, *pb = &pb0; int i; int64_t filesize = avio_size(s->pb); + uint64_t n_sb_blocks_tmp; ffio_init_context(pb, buf, size, 0, NULL, NULL, NULL, NULL); ffio_read_varlen(pb); // track_index_len avio_r8(pb); // 'c' - viv->n_sb_blocks = ffio_read_varlen(pb); - if (viv->n_sb_blocks < 0 || viv->n_sb_blocks > size / 2) + n_sb_blocks_tmp = ffio_read_varlen(pb); + if (n_sb_blocks_tmp > size / 2) goto error; - viv->sb_blocks = av_calloc(viv->n_sb_blocks, sizeof(VIV_SB_block)); + viv->sb_blocks = av_calloc(n_sb_blocks_tmp, sizeof(*viv->sb_blocks)); if (!viv->sb_blocks) { - viv->n_sb_blocks = 0; return AVERROR(ENOMEM); } + viv->n_sb_blocks = n_sb_blocks_tmp; off = 0; poff = 0;