yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #1128 from DarkLordZach/malformed-hex-crash 

hex_util: Replace logic_errors with LOG_CRITICAL
This commit is contained in:
bunnei 2018-08-27 15:45:22 -04:00 committed by GitHub
parent af59d4bff0 06487c2c8d
commit 887a9c5c29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/hex_util.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/hex_util.h" #include "common/hex_util.h"
#include "common/logging/log.h"
namespace Common { namespace Common {
@ -13,18 +14,29 @@ u8 ToHexNibble(char c1) {
return c1 - 87; return c1 - 87;
if (c1 >= 48 && c1 <= 57) if (c1 >= 48 && c1 <= 57)
return c1 - 48; return c1 - 48;
throw std::logic_error("Invalid hex digit"); LOG_ERROR(Common, "Invalid hex digit: 0x{:02X}", c1);
return 0;
} }
std::array<u8, 16> operator""_array16(const char* str, size_t len) { std::array<u8, 16> operator""_array16(const char* str, size_t len) {
if (len != 32) if (len != 32) {
throw std::logic_error("Not of correct size."); LOG_ERROR(Common,
"Attempting to parse string to array that is not of correct size (expected=32, "
"actual={}).",
len);
return {};
}
return HexStringToArray<16>(str); return HexStringToArray<16>(str);
} }
std::array<u8, 32> operator""_array32(const char* str, size_t len) { std::array<u8, 32> operator""_array32(const char* str, size_t len) {
if (len != 64) if (len != 64) {
throw std::logic_error("Not of correct size."); LOG_ERROR(Common,
"Attempting to parse string to array that is not of correct size (expected=64, "
"actual={}).",
len);
return {};
}
return HexStringToArray<32>(str); return HexStringToArray<32>(str);
} }