scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 17:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #171 from zhouzi88/master

Browse Source 
add buffer size for make_printable__()
This commit is contained in:
Jeffrey Townsend
2017-03-02 07:45:12 -08:00
committed by GitHub
parent 52cb0a0f4b d391b8b5d7
commit 1300f71461
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/base/any/onlp/src/sff/module/src/sff.c
View File

@@ -325,13 +325,14 @@ sff_module_caps_get(sff_module_type_t mt, uint32_t *caps)
}
static void
make_printable__(char* string)
make_printable__(char* string, int size)
{
char* p;
for(p = string; p && *p; p++) {
for(p = string; p && *p && size; p++) {
if(!isprint(*p)) {
*p = '?';
}
size --;
}
}
@@ -407,21 +408,21 @@ sff_eeprom_parse(sff_eeprom_t* se, uint8_t* eeprom)
const char *empty = " ";
if (*vendor) {
aim_strlcpy(se->info.vendor, (char*)vendor, sizeof(se->info.vendor));
make_printable__(se->info.vendor);
make_printable__(se->info.vendor, sizeof(se->info.vendor));
}
else {
aim_strlcpy(se->info.vendor, empty, 17);
}
if (*model) {
aim_strlcpy(se->info.model, (char*)model, sizeof(se->info.model));
make_printable__(se->info.model);
make_printable__(se->info.model, sizeof(se->info.model));
}
else {
aim_strlcpy(se->info.model, empty, 17);
}
if (*serial) {
aim_strlcpy(se->info.serial, (char*)serial, sizeof(se->info.serial));
make_printable__(se->info.serial);
make_printable__(se->info.serial, sizeof(se->info.serial));
}
else {
aim_strlcpy(se->info.serial, empty, 17);