Module Name: src
Committed By: riz
Date: Sun Dec 16 19:12:53 UTC 2012
Modified Files:
src/sys/arch/i386/i386 [netbsd-6-0]: multiboot.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #749):
sys/arch/i386/i386/multiboot.c: revision 1.22
Fix off by one.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.20.1 src/sys/arch/i386/i386/multiboot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/multiboot.c
diff -u src/sys/arch/i386/i386/multiboot.c:1.21 src/sys/arch/i386/i386/multiboot.c:1.21.20.1
--- src/sys/arch/i386/i386/multiboot.c:1.21 Tue Jan 11 12:24:37 2011
+++ src/sys/arch/i386/i386/multiboot.c Sun Dec 16 19:12:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: multiboot.c,v 1.21 2011/01/11 12:24:37 gsutre Exp $ */
+/* $NetBSD: multiboot.c,v 1.21.20.1 2012/12/16 19:12:53 riz Exp $ */
/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: multiboot.c,v 1.21 2011/01/11 12:24:37 gsutre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multiboot.c,v 1.21.20.1 2012/12/16 19:12:53 riz Exp $");
#include "opt_multiboot.h"
@@ -506,7 +506,7 @@ setup_bootpath(struct multiboot_info *mi
*cl2 = '\0';
memcpy(bi.bootpath, cl, MIN(sizeof(bi.bootpath), len));
*cl2 = old;
- bi.bootpath[MIN(sizeof(bi.bootpath), len)] = '\0';
+ bi.bootpath[MIN(sizeof(bi.bootpath) - 1, len)] = '\0';
bootinfo_add((struct btinfo_common *)&bi, BTINFO_BOOTPATH,
sizeof(struct btinfo_bootpath));
