piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

StringUtil: Add IsPrintableCharacter and use it

Browse Source 
Add a function that safely returns whether a character is printable
i.e. whether 0x20 <= c <= 0x7e is true.

This is done in several places in our codebase and it's easy to run
into undefined behaviour if the C version defined in <cctype>
is used instead of this one, since its behaviour is undefined
if the character is not representable as an unsigned char.

This fixes MemoryViewWidget.
This commit is contained in:
Léo Lam
2019-12-30 10:48:11 +01:00
parent 1cc7ef356b
commit 89b0ab2d22
7 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DiscIO/VolumeWad.cpp
View File

@ -5,7 +5,6 @@
#include <algorithm>
#include <cstddef>
#include <cstring>
#include <locale>
#include <map>
#include <memory>
#include <optional>
@ -261,8 +260,7 @@ std::string VolumeWAD::GetMakerID(const Partition& partition) const
return "00";
// Some weird channels use 0x0000 in place of the MakerID, so we need a check here
const std::locale& c_locale = std::locale::classic();
if (!std::isprint(temp[0], c_locale) || !std::isprint(temp[1], c_locale))
if (!IsPrintableCharacter(temp[0]) || !IsPrintableCharacter(temp[1]))
return "00";
return DecodeString(temp);