From patchwork Mon Dec 23 14:48:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16931 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 178D744B182 for ; Mon, 23 Dec 2019 17:12:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F367668A3B2; Mon, 23 Dec 2019 17:12:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE7416880E8 for ; Mon, 23 Dec 2019 17:12:09 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id q8so9326085pfh.7 for ; Mon, 23 Dec 2019 07:12: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; bh=heXbrMwOLnDHw4LxR6PzL2Cop1PFo6O07zZmjtuXc7s=; b=pY/y297NXkjkX3IAi/dJbLKB4z8OQnbtX/FiwzhevliO2sS2ul7B1mJXZd2J86BENh suWbp+6bI/qSJQ4Z8qu6K86M3qqis3vCuMvmSA+yPzd4o/O8uSTW0SgrM/lQGA++NecS o7sHF6ianbvNJqwDNYqBumIViNYF0Gvg/SkREtRoln+hnU5uMxSc/IA3WSzWP1wuNZA/ 7t61Izo05EuPvxjzZKnDr7T7nbd3xrPNSwyEfouGkWPWUjE768GrBgA5BdEZR9BI5c8t ej4o+Rr2BLy5X/cHQ2wqjr2fdmwD1D+S+jVTjfsI+Im1XsDnzPnD6UPA/8B7sQu5Z1tC 8TwA== 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; bh=heXbrMwOLnDHw4LxR6PzL2Cop1PFo6O07zZmjtuXc7s=; b=DJKQUL/6mn6tYKyVITJlBvTK4+AV1SH5YS042Vq+e9pEnkItFRjihMqSDTSJYltm5q F5VF1Cq/sZZXqhAWTZJPJ+lUVVPVrpnwAj83udJBKIUFg1fjYsXO1nz+bG4xRb6Qy/tB SlQN5+VplRTqIBLICRJPiHaMHOFM7YRwKS0FjDVb9HfecGcOyTwDDecTR4mYms3n/Jyn /IOrKfLpMCCT7+SKfYPXJRfbnJAEgLVe7rLRZxCfOIScpoxXAl52KwuMqLQpXcbcntj2 +q/2AymQup4c273eW8TkY8fNeWUStXDyHEP1zVzOYBc/Ivt4oDko/+iyt6iT+xtluPvo Z6gA== X-Gm-Message-State: APjAAAX5OKhfkj5S6wcTbwRhrFAyGzu8m+E/W7PDlKBQSJLk0Mnc4dhA LGAwapdDQbLLwYHSdQDJd5JFgObQ X-Google-Smtp-Source: APXvYqzzSrewkZPuEcDhPX50LTqDMQy678mNINoMkkluBSgkXnVAZSy+XCcI6BrPujpanPsPpr7FJQ== X-Received: by 2002:aa7:880c:: with SMTP id c12mr14121294pfo.255.1577112498986; Mon, 23 Dec 2019 06:48:18 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id i17sm2382391pfr.67.2019.12.23.06.48.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Dec 2019 06:48:18 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Dec 2019 22:48:13 +0800 Message-Id: <20191223144813.25900-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] 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 1d0faec687..0a1ba877cc 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;