Date: Sun, 9 Oct 2016 19:57:20 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r306909 - stable/11/usr.sbin/fifolog/lib Message-ID: <201610091957.u99JvLmP086675@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Sun Oct 9 19:57:20 2016 New Revision: 306909 URL: https://svnweb.freebsd.org/changeset/base/306909 Log: MFC r305812: fifolog(1): invert order of calloc(3) arguments. The second argument to calloc(3) should be the size, make it so. While here be a little bit more cautious in fifolog_reader_open() to protect in the unlikely event of an overflowed allocation. Modified: stable/11/usr.sbin/fifolog/lib/fifolog_create.c stable/11/usr.sbin/fifolog/lib/fifolog_reader.c stable/11/usr.sbin/fifolog/lib/fifolog_write_poll.c stable/11/usr.sbin/fifolog/lib/miniobj.h Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/fifolog/lib/fifolog_create.c ============================================================================== --- stable/11/usr.sbin/fifolog/lib/fifolog_create.c Sun Oct 9 18:39:13 2016 (r306908) +++ stable/11/usr.sbin/fifolog/lib/fifolog_create.c Sun Oct 9 19:57:20 2016 (r306909) @@ -97,7 +97,7 @@ fifolog_create(const char *fn, off_t siz if (S_ISREG(st.st_mode) && ftruncate(fd, size) < 0) return ("Could not ftrunc"); - buf = calloc(recsize, 1); + buf = calloc(1, recsize); if (buf == NULL) return ("Could not malloc"); Modified: stable/11/usr.sbin/fifolog/lib/fifolog_reader.c ============================================================================== --- stable/11/usr.sbin/fifolog/lib/fifolog_reader.c Sun Oct 9 18:39:13 2016 (r306908) +++ stable/11/usr.sbin/fifolog/lib/fifolog_reader.c Sun Oct 9 19:57:20 2016 (r306909) @@ -67,10 +67,10 @@ fifolog_reader_open(const char *fname) if (retval != NULL) err(1, "%s", retval); - fr->olen = fr->ff->recsize * 16; - fr->obuf = calloc(fr->olen, 1); + fr->obuf = calloc(16, fr->ff->recsize); if (fr->obuf == NULL) err(1, "Cannot malloc"); + fr->olen = fr->ff->recsize * 16; i = inflateInit(fr->ff->zs); assert(i == Z_OK); Modified: stable/11/usr.sbin/fifolog/lib/fifolog_write_poll.c ============================================================================== --- stable/11/usr.sbin/fifolog/lib/fifolog_write_poll.c Sun Oct 9 18:39:13 2016 (r306908) +++ stable/11/usr.sbin/fifolog/lib/fifolog_write_poll.c Sun Oct 9 19:57:20 2016 (r306909) @@ -45,7 +45,7 @@ static int fifolog_write_gzip(struct fifolog_writer *f, time_t now); #define ALLOC(ptr, size) do { \ - (*(ptr)) = calloc(size, 1); \ + (*(ptr)) = calloc(1, size); \ assert(*(ptr) != NULL); \ } while (0) Modified: stable/11/usr.sbin/fifolog/lib/miniobj.h ============================================================================== --- stable/11/usr.sbin/fifolog/lib/miniobj.h Sun Oct 9 18:39:13 2016 (r306908) +++ stable/11/usr.sbin/fifolog/lib/miniobj.h Sun Oct 9 19:57:20 2016 (r306909) @@ -28,7 +28,7 @@ #define ALLOC_OBJ(to, type_magic) \ do { \ - (to) = calloc(sizeof *(to), 1); \ + (to) = calloc(1, sizeof *(to)); \ if ((to) != NULL) \ (to)->magic = (type_magic); \ } while (0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610091957.u99JvLmP086675>