Date: Wed, 11 Mar 2015 09:49:07 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r279877 - stable/10/sys/boot/fdt Message-ID: <201503110949.t2B9n7Yk000610@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Wed Mar 11 09:49:06 2015 New Revision: 279877 URL: https://svnweb.freebsd.org/changeset/base/279877 Log: MFC r279275: Fix potential NULL dereference. Submitted by: Dmitry Luhtionov <dmitryluhtionov@gmail.com> Modified: stable/10/sys/boot/fdt/fdt_loader_cmd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/boot/fdt/fdt_loader_cmd.c ============================================================================== --- stable/10/sys/boot/fdt/fdt_loader_cmd.c Wed Mar 11 09:09:47 2015 (r279876) +++ stable/10/sys/boot/fdt/fdt_loader_cmd.c Wed Mar 11 09:49:06 2015 (r279877) @@ -1299,13 +1299,12 @@ fdt_merge_strings(int argc, char *argv[] sz += argc - start; buf = (char *)malloc(sizeof(char) * sz); - bzero(buf, sizeof(char) * sz); - if (buf == NULL) { sprintf(command_errbuf, "could not allocate space " "for string"); return (1); } + bzero(buf, sizeof(char) * sz); idx = 0; for (i = start, idx = 0; i < argc; i++) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503110949.t2B9n7Yk000610>