⬢ DragonFlyBSD Kernel Audit
DF-1093 / fix.diff
← back to finding ↓ download raw 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
diff --git a/sys/bus/ppbus/ppbconf.c b/sys/bus/ppbus/ppbconf.c
index 0000000..1111111 100644
--- a/sys/bus/ppbus/ppbconf.c
+++ b/sys/bus/ppbus/ppbconf.c
@@ -237,38 +237,48 @@
 		str[i] = (str[i] == ';') ? '\0' : str[i];
 
 	if ((token = search_token(str, len, "MFG")) != NULL ||
-		(token = search_token(str, len, "MANUFACTURER")) != NULL)
+		(token = search_token(str, len, "MANUFACTURER")) != NULL) {
+		char *val = search_token(token, UNKNOWN_LENGTH, ":");
 		kprintf("ppbus%d: <%s", unit,
-			search_token(token, UNKNOWN_LENGTH, ":") + 1);
-	else
+			val != NULL ? val + 1 : "");
+	} else
 		kprintf("ppbus%d: <unknown", unit);
 
 	if ((token = search_token(str, len, "MDL")) != NULL ||
-		(token = search_token(str, len, "MODEL")) != NULL)
-		kprintf(" %s",
-			search_token(token, UNKNOWN_LENGTH, ":") + 1);
-	else
+		(token = search_token(str, len, "MODEL")) != NULL) {
+		char *val = search_token(token, UNKNOWN_LENGTH, ":");
+		kprintf(" %s", val != NULL ? val + 1 : "");
+	} else
 		kprintf(" unknown");
 
-	if ((token = search_token(str, len, "VER")) != NULL)
-		kprintf("/%s",
-			search_token(token, UNKNOWN_LENGTH, ":") + 1);
-
-	if ((token = search_token(str, len, "REV")) != NULL)
-		kprintf(".%s",
-			search_token(token, UNKNOWN_LENGTH, ":") + 1);
+	if ((token = search_token(str, len, "VER")) != NULL) {
+		char *val = search_token(token, UNKNOWN_LENGTH, ":");
+		if (val != NULL)
+			kprintf("/%s", val + 1);
+	}
+
+	if ((token = search_token(str, len, "REV")) != NULL) {
+		char *val = search_token(token, UNKNOWN_LENGTH, ":");
+		if (val != NULL)
+			kprintf(".%s", val + 1);
+	}
 
 	kprintf(">");
 
 	if ((token = search_token(str, len, "CLS")) != NULL) {
-		class = search_token(token, UNKNOWN_LENGTH, ":") + 1;
-		kprintf(" %s", class);
+		char *val = search_token(token, UNKNOWN_LENGTH, ":");
+		if (val != NULL) {
+			class = val + 1;
+			kprintf(" %s", class);
+		}
 	}
 
 	if ((token = search_token(str, len, "CMD")) != NULL ||
-		(token = search_token(str, len, "COMMAND")) != NULL)
-		kprintf(" %s",
-			search_token(token, UNKNOWN_LENGTH, ":") + 1);
+		(token = search_token(str, len, "COMMAND")) != NULL) {
+		char *val = search_token(token, UNKNOWN_LENGTH, ":");
+		if (val != NULL)
+			kprintf(" %s", val + 1);
+	}
 
 	kprintf("\n");