ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make CVolumeWAD::GetName() safer 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3938 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-08-04 03:27:56 +00:00
parent 8b1aff8b59
commit 62899da626
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/DiscIO/Src/VolumeWad.cpp
View File

@ -113,34 +113,25 @@ std::string CVolumeWAD::GetName() const
return "Unknown"; return "Unknown";
// Offset to the english title // Offset to the english title
char temp[85]; char temp[84];
if (!Read(0xF1 + OpeningBnrOffset, 84, (u8*)&temp) || Common::swap32(footer_size) < 0xF1) if (!Read(0xF1 + OpeningBnrOffset, 84, (u8*)&temp) || Common::swap32(footer_size) < 0xF1)
return "Unknown"; return "Unknown";
char out_temp[43]; // Remove the null bytes due to 16bit char length
int j = 0; std::string out_temp;
for (int i = 0; i < sizeof(temp); i+=2)
for (int i=0; i < 84; i++)
{ {
if (!(i & 1)) // Replace null chars with a single space per null section
if (temp[i] == '\0' && i > 0)
{ {
if (temp[i] != 0) if (out_temp.at(out_temp.size()-1) != ' ')
out_temp[j] = temp[i]; out_temp.push_back(' ');
}
else else
{ out_temp.push_back(temp[i]);
// Some wads have a few consecutive Null chars followed by text
// as i don't know what to do there: replace the frst one with space
if (out_temp[j-1] != 32)
out_temp[j] = 32;
else
continue;
} }
// Make it a null terminated string
j++; out_temp.replace(out_temp.end()-1, out_temp.end(), 1, '\0');
}
}
out_temp[j] = 0;
return out_temp; return out_temp;
} }