Chameleon Commit Details - 2637 - Chameleon open source boot loader project.

Date:

2015-03-15 22:34:22 (9 years 1 month ago)

Author:

ErmaC

Commit:

2637

Parents:

2636

Message:

Add size as arg to getPlatformName using strlcpy

Changes:

M	/trunk/i386/libsaio/bootstruct.c
M	/trunk/i386/libsaio/misc.c
M	/trunk/i386/libsaio/saio_internal.h

File differences

-98
99 99
100 100
101 
101
102 102
103 103
104 104
+␉␉␉stop("Couldn't create root node");␊
␉␉}␊
␊
␉␉getPlatformName(platformName);␊
␉␉getPlatformName(platformName, sizeof(platformName));␊
␉␉nameLen = strlen(platformName) + 1;␊
␉␉DT__AddProperty(node, "compatible", nameLen, platformName);␊
␉␉DT__AddProperty(node, "model", nameLen, platformName);␊
 ␉␉␉stop("Couldn't create root node");␊
 ␉␉}␊
 ␊
-␉␉getPlatformName(platformName);␊
+␉␉getPlatformName(platformName, sizeof(platformName));␊
 ␉␉nameLen = strlen(platformName) + 1;␊
 ␉␉DT__AddProperty(node, "compatible", nameLen, platformName);␊
 ␉␉DT__AddProperty(node, "model", nameLen, platformName);␊

-115
116 116
117 117
118 
118
119 119
120 
120
121 121
122 122
+//␊
#ifndef BOOT1␊
void␊
getPlatformName(char *nameBuf)␊
getPlatformName(char *nameBuf, int size)␊
{␊
    strcpy(nameBuf, "ACPI");␊
    strlcpy(nameBuf, "ACPI", size);␊
}␊
#endif␊
 //␊
 #ifndef BOOT1␊
 void␊
-getPlatformName(char *nameBuf)␊
+getPlatformName(char *nameBuf, int size)␊
 {␊
-    strcpy(nameBuf, "ACPI");␊
+    strlcpy(nameBuf, "ACPI", size);␊
 }␊
 #endif␊

-140
141 141
142 142
143 
143
144 144
145 145
146 146
+/* misc.c */␊
extern int    checkForSupportedHardware();␊
extern int␉  isLaptop();␊
extern void   getPlatformName(char *nameBuf);␊
extern void   getPlatformName(char *nameBuf, int size);␊
␊
/* nbp.c */␊
extern UInt32 nbpUnloadBaseCode();␊
 /* misc.c */␊
 extern int    checkForSupportedHardware();␊
 extern int␉  isLaptop();␊
-extern void   getPlatformName(char *nameBuf);␊
+extern void   getPlatformName(char *nameBuf, int size);␊
 ␊
 /* nbp.c */␊
 extern UInt32 nbpUnloadBaseCode();␊