Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add sanity checks for input string in wxHexToDec()

Browse Source 
Check if the length of the string is appropriate and if it contains hexadecimal characters.
Also document this function.

Closes #12814.
This commit is contained in:
Artur Wieczorek
2017-02-23 20:07:04 +01:00
parent 2ecd4a07ba
commit 71305cff62
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/utils.h
View File

@@ -296,15 +296,23 @@ inline int wxHexToDec(const char* buf)
if (buf[0] >= 'A')
firstDigit = buf[0] - 'A' + 10;
else
else if (buf[0] >= '0')
firstDigit = buf[0] - '0';
else
firstDigit = -1;
wxCHECK_MSG( firstDigit >= 0 && firstDigit <= 15, -1, wxS("Invalid argument") );
if (buf[1] >= 'A')
secondDigit = buf[1] - 'A' + 10;
else
else if (buf[1] >= '0')
secondDigit = buf[1] - '0';
else
secondDigit = -1;
return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
wxCHECK_MSG( secondDigit >= 0 && secondDigit <= 15, -1, wxS("Invalid argument") );
return firstDigit * 16 + secondDigit;
}