Module Name: src
Committed By: maxv
Date: Sat Jan 25 15:59:11 UTC 2020
Modified Files:
src/sys/dev/videomode: edid.c
Log Message:
Fix uninitialized variable. There may not be a TYPE_ASCII block. Found by
kMSan with nouveau.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/videomode/edid.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/dev/videomode/edid.c
diff -u src/sys/dev/videomode/edid.c:1.14 src/sys/dev/videomode/edid.c:1.15
--- src/sys/dev/videomode/edid.c:1.14 Tue Jul 10 01:44:30 2018
+++ src/sys/dev/videomode/edid.c Sat Jan 25 15:59:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: edid.c,v 1.14 2018/07/10 01:44:30 macallan Exp $ */
+/* $NetBSD: edid.c,v 1.15 2020/01/25 15:59:11 maxv Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.14 2018/07/10 01:44:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.15 2020/01/25 15:59:11 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -467,6 +467,7 @@ edid_block(struct edid_info *edid, uint8
break;
case EDID_DESC_BLOCK_TYPE_ASCII:
+ memset(edid->edid_comment, 0, sizeof(edid->edid_comment));
memcpy(edid->edid_comment, data + EDID_DESC_ASCII_DATA_OFFSET,
EDID_DESC_ASCII_DATA_LEN);
edid->edid_comment[sizeof(edid->edid_comment) - 1] = 0;
@@ -562,6 +563,8 @@ edid_parse(uint8_t *data, struct edid_in
snprintf(edid->edid_serial, sizeof(edid->edid_serial), "%08x",
EDID_SERIAL_NUMBER(data));
+ edid->edid_comment[0] = '\0';
+
edid->edid_week = EDID_WEEK(data);
edid->edid_year = EDID_YEAR(data);
