Date: Fri, 18 Dec 2015 13:36:47 +0800 From: luke <luke.tw@gmail.com> To: John Baldwin <jhb@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r292410 - head/usr.sbin/boot0cfg Message-ID: <CAGVycpY1b7dZ2srj8xHai6EvcaDa2uFCVJRh6WbFdH3GF7txFA@mail.gmail.com> In-Reply-To: <201512172042.tBHKg5bM091931@repo.freebsd.org> References: <201512172042.tBHKg5bM091931@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Dec 18, 2015 at 4:42 AM, John Baldwin <jhb@freebsd.org> wrote: > Author: jhb > Date: Thu Dec 17 20:42:05 2015 > New Revision: 292410 > URL: https://svnweb.freebsd.org/changeset/base/292410 > > Log: > Exit cleanly if malloc() fails to allocate a buffer for a copy of the > current MBR. > > PR: 205322 > Submitted by: Alexander Kuleshov <kuleshovmail@gmail.com> > MFC after: 1 week > > Modified: > head/usr.sbin/boot0cfg/boot0cfg.c > > Modified: head/usr.sbin/boot0cfg/boot0cfg.c > > ============================================================================== > --- head/usr.sbin/boot0cfg/boot0cfg.c Thu Dec 17 20:33:20 2015 > (r292409) > +++ head/usr.sbin/boot0cfg/boot0cfg.c Thu Dec 17 20:42:05 2015 > (r292410) > @@ -337,6 +337,8 @@ read_mbr(const char *disk, u_int8_t **mb > return (mbr_size); > } > *mbr = malloc(sizeof(buf)); > + if (mbr == NULL) > + errx(1, "%s: unable to allocate MBR buffer", disk); > memcpy(*mbr, buf, sizeof(buf)); > close(fd); > > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > Hi, Should the check be against *mbr ? + if (*mbr == NULL) + errx(1, "%s: unable to allocate MBR buffer", disk); -- Luke Chang-Hsien Tsai
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGVycpY1b7dZ2srj8xHai6EvcaDa2uFCVJRh6WbFdH3GF7txFA>