Author: pfg
Date: Thu Apr 13 15:40:57 2017
New Revision: 316763
URL: https://svnweb.freebsd.org/changeset/base/316763

Log:
  MFC r316695, MFV r316693:
  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 <mahr...@delphix.com>
  Reviewed by: Paul Dagnelie <p...@delphix.com>
  Approved by: Robert Mustacchi <r...@joyent.com>
  Author:       Pedro Giffuni <p...@freebsd.org>

Modified:
  stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c   Thu Apr 
13 15:39:42 2017        (r316762)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_fru.c   Thu Apr 
13 15:40:57 2017        (r316763)
@@ -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;
 
        /*
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to