github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

parser: use stoul(), not strtol()

Browse Source
This commit is contained in:
Justin Viiret 2017-02-02 15:01:30 +11:00 committed by Matthew Barr
parent 4def0c8a52
commit bfc8be5675
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser/Parser.rl
View File

@ -974,7 +974,7 @@ unichar readUtf8CodePoint4c(const char *s) {
'\\o{' [0-7]+ '}' => { '\\o{' [0-7]+ '}' => {
string oct(ts + 3, te - ts - 4); string oct(ts + 3, te - ts - 4);
long int val = strtol(oct.c_str(), nullptr, 8); unsigned long val = stoul(oct, nullptr, 8);
if ((!mode.utf8 && val > 255) || val > MAX_UNICODE) { if ((!mode.utf8 && val > 255) || val > MAX_UNICODE) {
throw LocatedParseError("Value in \\o{...} sequence is too large"); throw LocatedParseError("Value in \\o{...} sequence is too large");
} }
@ -999,7 +999,7 @@ unichar readUtf8CodePoint4c(const char *s) {
# Unicode Hex # Unicode Hex
'\\x{' xdigit+ '}' => { '\\x{' xdigit+ '}' => {
string hex(ts + 3, te - ts - 4); string hex(ts + 3, te - ts - 4);
long int val = strtol(hex.c_str(), nullptr, 16); unsigned long val = stoul(hex, nullptr, 16);
if (val > MAX_UNICODE) { if (val > MAX_UNICODE) {
throw LocatedParseError("Value in \\x{...} sequence is too large"); throw LocatedParseError("Value in \\x{...} sequence is too large");
} }
@ -1488,7 +1488,7 @@ unichar readUtf8CodePoint4c(const char *s) {
}; };
'\\o{' [0-7]+ '}' => { '\\o{' [0-7]+ '}' => {
string oct(ts + 3, te - ts - 4); string oct(ts + 3, te - ts - 4);
long int val = strtol(oct.c_str(), nullptr, 8); unsigned long val = stoul(oct, nullptr, 8);
if ((!mode.utf8 && val > 255) || val > MAX_UNICODE) { if ((!mode.utf8 && val > 255) || val > MAX_UNICODE) {
throw LocatedParseError("Value in \\o{...} sequence is too large"); throw LocatedParseError("Value in \\o{...} sequence is too large");
} }
@ -1505,7 +1505,7 @@ unichar readUtf8CodePoint4c(const char *s) {
# Unicode Hex # Unicode Hex
'\\x{' xdigit+ '}' => { '\\x{' xdigit+ '}' => {
string hex(ts + 3, te - ts - 4); string hex(ts + 3, te - ts - 4);
long int val = strtol(hex.c_str(), nullptr, 16); unsigned long val = stoul(hex, nullptr, 16);
if (val > MAX_UNICODE) { if (val > MAX_UNICODE) {
throw LocatedParseError("Value in \\x{...} sequence is too large"); throw LocatedParseError("Value in \\x{...} sequence is too large");
} }