Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Apr 2017 22:46:34 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r316693 - vendor/illumos/dist/lib/libzfs/common
Message-ID:  <201704102246.v3AMkYt0087402@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pfg
Date: Mon Apr 10 22:46:34 2017
New Revision: 316693
URL: https://svnweb.freebsd.org/changeset/base/316693

Log:
  8046 Let calloc() do the multiplication in libzfs_fru_refresh
  
  https://github.com/illumos/illumos-gate/commit/5697e03e6e3e2697f56ae341c7c8ce79680d6a2e
  
  https://www.illumos.org/issues/8046
  
  Reviewed by: Matthew Ahrens <mahrens@delphix.com>
  Reviewed by: Paul Dagnelie <pcd@delphix.com>
  Approved by: Robert Mustacchi <rm@joyent.com>
  Author:	Pedro Giffuni <pfg@freebsd.org>

Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_fru.c

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_fru.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_fru.c	Mon Apr 10 21:49:35 2017	(r316692)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_fru.c	Mon Apr 10 22:46:34 2017	(r316693)
@@ -282,7 +282,7 @@ libzfs_fru_refresh(libzfs_handle_t *hdl)
 
 	if (hdl->libzfs_fru_hash == NULL &&
 	    (hdl->libzfs_fru_hash =
-	    calloc(ZFS_FRU_HASH_SIZE * sizeof (void *), 1)) == NULL)
+	    calloc(ZFS_FRU_HASH_SIZE, sizeof (void *))) == NULL)
 		return;
 
 	/*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704102246.v3AMkYt0087402>