svn commit: r327940 - head/sys/contrib/zstd/lib/freebsd

[Conrad Meyer]

This is not in contrib code --
https://lists.freebsd.org/pipermail/svn-src-all/2018-January/156505.html
.

On Sat, Jan 13, 2018 at 11:02 AM, Pedro F. Giffuni <pfg at freebsd.org> wrote:
> Author: pfg
> Date: Sat Jan 13 19:02:51 2018
> New Revision: 327940
> URL: https://svnweb.freebsd.org/changeset/base/327940
>
> Log:
>   zstd: Use mallocarray(9) for calloc macro.
>
>   This is in contrib code but since we only have mallocarray(9) in current
>   we will not upstream this.
>
>   This effectively brings back r327934, which was reverted to correct the
>   log message.
>
> Modified:
>   head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h
>
> Modified: head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h
> ==============================================================================
> --- head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h   Sat Jan 13 19:02:08 2018        (r327939)
> +++ head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h   Sat Jan 13 19:02:51 2018        (r327940)
> @@ -46,7 +46,7 @@ MALLOC_DECLARE(M_ZSTD);
>  #define malloc(x)      (malloc)((x), M_ZSTD, M_WAITOK)
>  #define free(x)                (free)((x), M_ZSTD)
>  /* in zstd's use of calloc, a is always 1 */
> -#define calloc(a,b)    (malloc)((a)*(b), M_ZSTD, M_WAITOK | M_ZERO)
> +#define calloc(a,b)    (mallocarray)((a), (b), M_ZSTD, M_WAITOK | M_ZERO)
>  #endif
>
>  #ifdef __cplusplus
>