From patchwork Thu Dec 26 00:33:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16958 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 69DB1449497 for ; Thu, 26 Dec 2019 02:34:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 483756881F9; Thu, 26 Dec 2019 02:34:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D02668818B for ; Thu, 26 Dec 2019 02:34:09 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id z124so12098538pgb.13 for ; Wed, 25 Dec 2019 16:34:09 -0800 (PST) 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; bh=kvaWiGBMCTTvcOntnECD10uXzPwnlaB6sxftBPz+/iU=; b=Vz7y4fdxKXX+PyhmGYV1YL1oBRhFX3e7AkicUEGXkmhqXizt7myutUxEUUt5JcTd3L 74r53LtXRB3Yg3eZ1BofXGHJhddHjzwV6MsVKJtfyub9Ft7CoNlCExOhpPrCHidSO+53 afSQsD740JVuCCe8xwhHU+acFt/iQRCTfYt1EhSGRLYrQ8IDmYmkSdlOryhMHPEeLnLL mNW687HGzcveFrZrc1dAW2M/ZzzJibL/389Njc2psy8HHqiao+ACEG719c5IewBnMwX9 SPEaVwnFhZG0mt/0PDyTET1p5m2nL2LarqhdNOHMPMJoD4ad9tyEJ30oWYh/uyn6qb6m KnRw== 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; bh=kvaWiGBMCTTvcOntnECD10uXzPwnlaB6sxftBPz+/iU=; b=dENCRTT6CHFqhRuBfQ0g9moO4NnhaYBaSdPo+EUJ9A1/8BSoLq3agxC4g3JJxdIVk8 BIUJiyZgVBwpWkC84al2rz2ShIGllFV1Mjb5DraEa+ZeioUGYn7GhagnVvTN2CJYWnjD vPI7CCk8m4ozzwB1TK6WN1Wf4kNRx4mHdsNi1Ff4aep8TspbguOW1f85u6IgT00d5/0r cKYoVI815VRsELVNZeSO/WI6+BkUkClv2vEK6toG2hHtoigHkhIX8UN2cZIs7dq7BGKL hfIQatW8pAheMisayrOHynDYMACu0pRv7XO9VCbFMka07K67HkzXh7v1DAqNikRUiqcr WjUA== X-Gm-Message-State: APjAAAXzzBo/0gJMobuPMxinja35HLI+WZ5iErnBAj+FK8czkIsUtm/g 9m+F5o8aN7oFsI67TeozXK89nthF X-Google-Smtp-Source: APXvYqys4tlVxr9H59Ccu78Cpn1j1CuQ8RzBbwmDK+9LmWbmbCRP5F6JQwiU50v1grKf8CPurFf3KQ== X-Received: by 2002:a63:5525:: with SMTP id j37mr44881525pgb.180.1577320447139; Wed, 25 Dec 2019 16:34:07 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id k21sm29812741pgt.22.2019.12.25.16.34.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Dec 2019 16:34:06 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 08:33:38 +0800 Message-Id: <20191226003338.356-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191223144813.25900-1-lance.lmwang@gmail.com> References: <20191223144813.25900-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3] avutil/frame: Use av_realloc_array() 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavutil/frame.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index e403809..2e763ef 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -696,11 +696,8 @@ AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, if (!buf) return NULL; - if (frame->nb_side_data > INT_MAX / sizeof(*frame->side_data) - 1) - return NULL; - - tmp = av_realloc(frame->side_data, - (frame->nb_side_data + 1) * sizeof(*frame->side_data)); + tmp = av_realloc_array(frame->side_data, + frame->nb_side_data + 1, sizeof(*frame->side_data)); if (!tmp) return NULL; frame->side_data = tmp;