[src/netbsd-6-0]: src/sys/arch/i386/i386 Pull up following revision(s) (reque...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/056fab2ed6a2
branches:  netbsd-6-0
changeset: 774724:056fab2ed6a2
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Dec 16 19:12:53 2012 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #749):
        sys/arch/i386/i386/multiboot.c: revision 1.22
Fix off by one.

diffstat:

 sys/arch/i386/i386/multiboot.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f46a7c458df4 -r 056fab2ed6a2 sys/arch/i386/i386/multiboot.c
--- a/sys/arch/i386/i386/multiboot.c    Sun Dec 16 18:24:41 2012 +0000
+++ b/sys/arch/i386/i386/multiboot.c    Sun Dec 16 19:12:53 2012 +0000
@@ -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 @@
                *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));