i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace usage of strncpy by strlcpy to insure NULL termination

Browse Source 
CID 10631
This commit is contained in:
Philippe Saint-Pierre
2011-11-27 12:05:41 -05:00
parent 81a29f5613
commit b3fe883d9c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp
+5 -5
View File
@@ -477,7 +477,7 @@ Mixer::_CreateMIXControlGroup(multi_mix_control_info* MultiInfo, int32& index,
Controls[index].parent = parentIndex; Controls[index].parent = parentIndex;
Controls[index].string = Info.fNameId; Controls[index].string = Info.fNameId;
if (Info.fName != NULL) if (Info.fName != NULL)
strncpy(Controls[index].name, Info.fName, sizeof(Controls[index].name)); strlcpy(Controls[index].name, Info.fName, sizeof(Controls[index].name));
index++; index++;
if (Info.fType & MIX_Mute) { if (Info.fType & MIX_Mute) {
@@ -499,7 +499,7 @@ Mixer::_CreateMIXControlGroup(multi_mix_control_info* MultiInfo, int32& index,
Controls[index].parent = groupIndex; Controls[index].parent = groupIndex;
Controls[index].string = Info.fExNameId; Controls[index].string = Info.fExNameId;
if (Info.fExName != NULL) if (Info.fExName != NULL)
strncpy(Controls[index].name, Info.fExName, strlcpy(Controls[index].name, Info.fExName,
sizeof(Controls[index].name)); sizeof(Controls[index].name));
TRACE("Enable:%#010x\n", Controls[index].id); TRACE("Enable:%#010x\n", Controls[index].id);
@@ -534,7 +534,7 @@ Mixer::_CreateMIXControlGroup(multi_mix_control_info* MultiInfo, int32& index,
Controls[index].parent = groupIndex; Controls[index].parent = groupIndex;
Controls[index].string = Info.fExNameId; Controls[index].string = Info.fExNameId;
if (Info.fExName != NULL) if (Info.fExName != NULL)
strncpy(Controls[index].name, Info.fExName, strlcpy(Controls[index].name, Info.fExName,
sizeof(Controls[index].name)); sizeof(Controls[index].name));
TRACE("Boost:%#010x\n", Controls[index].id); TRACE("Boost:%#010x\n", Controls[index].id);
@@ -548,7 +548,7 @@ Mixer::_CreateMIXControlGroup(multi_mix_control_info* MultiInfo, int32& index,
Controls[index].flags = B_MULTI_MIX_MUX; Controls[index].flags = B_MULTI_MIX_MUX;
Controls[index].parent = groupIndex; Controls[index].parent = groupIndex;
Controls[index].string = S_null; Controls[index].string = S_null;
strncpy(Controls[index].name, Info.fExName, sizeof(Controls[index].name)); strlcpy(Controls[index].name, Info.fExName, sizeof(Controls[index].name));
TRACE("MUX:%#010x\n", Controls[index].id); TRACE("MUX:%#010x\n", Controls[index].id);
index++; index++;
@@ -602,7 +602,7 @@ Mixer::ListMixControls(multi_mix_control_info* Info)
Controls[index].flags = B_MULTI_MIX_GROUP; Controls[index].flags = B_MULTI_MIX_GROUP;
Controls[index].parent = 0; Controls[index].parent = 0;
Controls[index].string = S_null; Controls[index].string = S_null;
strncpy(Controls[index].name, "Record", sizeof(Controls[index].name)); strlcpy(Controls[index].name, "Record", sizeof(Controls[index].name));
index++; index++;
for (size_t i = 0; i < _countof(RecordControls); i++) { for (size_t i = 0; i < _countof(RecordControls); i++) {