[src/netbsd-7]: src/sys/dev/wscons Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/9dc2ac9a54b6
branches:  netbsd-7
changeset: 798544:9dc2ac9a54b6
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Nov 11 12:50:48 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #212):
        sys/dev/wscons/wsdisplay_vcons.c: revision 1.33
allocate char and attr buffers with M_ZERO

diffstat:

 sys/dev/wscons/wsdisplay_vcons.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r eb4114036237 -r 9dc2ac9a54b6 sys/dev/wscons/wsdisplay_vcons.c
--- a/sys/dev/wscons/wsdisplay_vcons.c  Tue Nov 11 12:48:59 2014 +0000
+++ b/sys/dev/wscons/wsdisplay_vcons.c  Tue Nov 11 12:50:48 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wsdisplay_vcons.c,v 1.32 2014/03/18 18:20:42 riastradh Exp $ */
+/*     $NetBSD: wsdisplay_vcons.c,v 1.32.4.1 2014/11/11 12:50:48 martin Exp $ */
 
 /*-
  * Copyright (c) 2005, 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.32 2014/03/18 18:20:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.32.4.1 2014/11/11 12:50:48 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -314,8 +314,10 @@
                if (vd->chars != NULL) free(vd->chars, M_DEVBUF);
                if (vd->attrs != NULL) free(vd->attrs, M_DEVBUF);
                vd->cells = size;
-               vd->chars = malloc(size * sizeof(uint32_t), M_DEVBUF, M_WAITOK);
-               vd->attrs = malloc(size * sizeof(long), M_DEVBUF, M_WAITOK);
+               vd->chars = malloc(size * sizeof(uint32_t), M_DEVBUF,
+                   M_WAITOK|M_ZERO);
+               vd->attrs = malloc(size * sizeof(long), M_DEVBUF,
+                   M_WAITOK|M_ZERO);
                vcons_invalidate_cache(vd);
        }
 #endif