Skip to content

Commit 883add5

Browse files
committed
Fixed tidy warnings.
1 parent 1db4329 commit 883add5

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

includes/RhythmGameUtilities/ParsersInternal.hpp

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ extern "C"
2727

2828
for (auto i = 0; i < internalSections.size(); i += 1)
2929
{
30-
sections[i].name =
31-
(char *)malloc(strlen(internalSections[i].name.c_str()) + 1);
32-
strcpy(sections[i].name, internalSections[i].name.c_str());
30+
auto nameLength = internalSections[i].name.size() + 1;
31+
sections[i].name = (char *)malloc(nameLength + 1);
32+
strncpy(sections[i].name, internalSections[i].name.c_str(),
33+
nameLength - 1);
34+
sections[i].name[nameLength - 1] = '\0';
3335

3436
sections[i].lines = (KeyValuePairInternal *)malloc(
3537
internalSections[i].lines.size() *
@@ -39,18 +41,23 @@ extern "C"
3941

4042
for (auto j = 0; j < internalSections[i].lines.size(); j += 1)
4143
{
42-
sections[i].lines[j].key = (char *)malloc(
43-
strlen(internalSections[i].lines[j].first.c_str()) + 1);
44-
strcpy(sections[i].lines[j].key,
45-
internalSections[i].lines[j].first.c_str());
44+
auto keyLength = internalSections[i].lines[j].first.size() + 1;
45+
sections[i].lines[j].key = (char *)malloc(keyLength);
46+
strncpy(sections[i].lines[j].key,
47+
internalSections[i].lines[j].first.c_str(),
48+
keyLength - 1);
49+
sections[i].lines[j].key[keyLength - 1] = '\0';
4650

4751
auto values = internalSections[i].lines[j].second;
4852

4953
for (auto k = 0; k < values.size(); k += 1)
5054
{
55+
auto valueLength = values[k].size() + 1;
5156
sections[i].lines[j].values[k] =
52-
(char *)malloc(strlen(values[k].c_str()) + 1);
53-
strcpy(sections[i].lines[j].values[k], values[k].c_str());
57+
(char *)malloc(valueLength);
58+
strncpy(sections[i].lines[j].values[k], values[k].c_str(),
59+
values[k].size());
60+
sections[i].lines[j].values[k][valueLength - 1] = '\0';
5461
}
5562

5663
sections[i].lines[j].valueCount = values.size();

0 commit comments

Comments
 (0)