From patchwork Sun Sep 22 12:24:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 15224 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 54AE8448A1B for ; Sun, 22 Sep 2019 15:24:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 381AF6898D0; Sun, 22 Sep 2019 15:24:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B864768836F for ; Sun, 22 Sep 2019 15:24:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569155061; bh=JCAjdK+2Gcyin+ObHelrtHBWWYCY4VMpyOa2YPPlRi4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=cg+d/dePk/Rb0bV/H7DSboCdfmXMLSZsc9m/16ZMCZolhokM1M46zNriCITmwFlAb 1Rz8wrP6tm+BvVZQy4gdezjNPPbnsTIeRlrNUUVm+CN9Snf9abVKhOheu9lKSNJBMj cdgsJ3QeHDVO4OcSLDhG35PDsXojqd/07a5idBvA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from paradise.fritz.box ([89.182.224.28]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1My36T-1hzAxG1TlH-00zaci; Sun, 22 Sep 2019 14:24:21 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Sun, 22 Sep 2019 14:24:11 +0200 Message-Id: <20190922122411.3183-1-barsnick@gmx.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:KigqQX3mJ/YhFz9gZWbKJa50EzSfXqMBig7NEyq1opNYyx695k+ KGcZQ4erAxGGObuGZjaGGQtSac4AJM5F7gR22EK+gbAGJ9+zp6m9S3BQBexyXlQP887lFmL JH5yIHUSrfv0hs1Eib/3dUY4CLQ2+4RkbBjNv1cjHkQb+Br8iUyYJhWyU9NCB+3mkGEaFEj XhFN2nkKg1rUrzakJR5GA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:XFB00ePVlUU=:MgClnuK5EVZ4j0rz882sWr ITiUBWl/n8j97XhHwBcWjsQ6IUDABL9Ct3ZitOA8jhbfW3dn9LxA+Qb7uSSji+OjQDHc1mwBz YW8+be9IHpLaNLTV8WacAO8lFYuVrAGVITziDxsHt2bizQ5SRd3Q0gmBqV0kYpYFVSs4Zo2HH GeRIni5v7KUP0TSuv7HOiBKFnQDW234HK5epy+KWhXnQIMi8aqBzTnE7S0mv0rZtG5ao/q39r 1iaTvVpuXSnnogdv5WIJYpKPCCiI9qlcsNGPZHGFVlD4k09HTlOvp3TEwDKIrRBPwmn641YKv zG/hCkEcB1jbABCgvOXwtEkXCwifcGPZ0bkmsnp4a7h9OvHdM1W72/Re0+uSqxKGTefOce04W ZhNvmiP9yB0tKEy/c4o4nvUL4B0z2NNd2WqUg55lch80wAbkaFSE/acSG8NaZyBflKCNRvtn3 F+Sb3UMvdYjcpEtdFQVzO/LZmXvYhXhFIMISjKd54WVvHCfVP+4X+U+D2P3KmzruwSCCfAAPK ShUI5DH7zaOWWXJ6Y9br0M2LCuCUnzL4j0Am8iq2M6s1qax9bfQSUR1gWLsYHNrOZXdxQUn1A vwLOFBaJeljuCRfS+I0rWpB43/nXWAWaIXjBNy0IDDZ5RJCFBm+lCmgY/VdVtZg/J9Vz39qEX mjzAXsgsAmcAQKrOIiPni6cdfQd1FjQ/P26AxytQzxtmV2ZgH8DuLR0poxC9lCN3wHvsm+9i7 vMRgcLOHATQUx7nL/PmATtKEpgr05VEP7FeJ+lzBvfnjQEE5JinbcFTATZeXd1wqNcDamwRmu B2KQQkD0swzMPkOB2GtgS9lJL+rEjM5ztu4iQCNhw88PxyIqgGMJ/tOWNA6FNXpXzBkgrtJEZ 5WoXwadPPVx6r1UkpQFauK41PbR38ZchxWQbd4VRXXtlfz3vdG4tu7x9v2NWX06IiCeRufFM6 GpEKX03DT5JxP7fymf0HndPtz+nhxLcYeTgSvabIX/B//+AGSIxR1eg4DvfWUPt0Uy7s+8mGF 37XXeZ1V7quumRMLpjb1qDoLxAe0uvIiqLY6n2zijKsPMn8CohcL/K75aCSG9tuqguhKhT0ot /tehvneOFhVF2M1Q7/S0165eQqCZh1w6ls3uykRkWrngrUph0TDLe5IzbAppdizpWN5IK6zsL zzTngTGp00pHD8EoH1UsT7HsbWeArHcC3Rbc0dVVA6/1leMdD4V18vDkH8LMJ9pfA4bnbjWNn s72iuN+Q3FSlR+/mDrLl6/f0f7b32lcqxKEpoV5scS67Pw3l/k78WawAKDlM= Subject: [FFmpeg-devel] [PATCH] avformat/hashenc: fix incorrect use of av_mallocz_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: Moritz Barsnick Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes CID 1453867, CID 1453866, CID 1453865. Signed-off-by: Moritz Barsnick --- libavformat/hashenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index 8e090731ae..34a8fd1f50 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -85,7 +85,7 @@ static int hash_init(struct AVFormatContext *s) int res; struct HashContext *c = s->priv_data; c->per_stream = 0; - c->hashes = av_mallocz_array(1, sizeof(c->hashes)); + c->hashes = av_mallocz_array(1, sizeof(*c->hashes)); if (!c->hashes) return AVERROR(ENOMEM); res = av_hash_alloc(&c->hashes[0], c->hash_name); @@ -102,7 +102,7 @@ static int streamhash_init(struct AVFormatContext *s) int res, i; struct HashContext *c = s->priv_data; c->per_stream = 1; - c->hashes = av_mallocz_array(s->nb_streams, sizeof(c->hashes)); + c->hashes = av_mallocz_array(s->nb_streams, sizeof(*c->hashes)); if (!c->hashes) return AVERROR(ENOMEM); for (i = 0; i < s->nb_streams; i++) { @@ -270,7 +270,7 @@ static int framehash_init(struct AVFormatContext *s) int res; struct HashContext *c = s->priv_data; c->per_stream = 0; - c->hashes = av_mallocz_array(1, sizeof(c->hashes)); + c->hashes = av_mallocz_array(1, sizeof(*c->hashes)); if (!c->hashes) return AVERROR(ENOMEM); res = av_hash_alloc(&c->hashes[0], c->hash_name);