github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: ScanInt fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@16006 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2021-06-23 10:02:58 +00:00
parent cd6e127e9e
commit 42a6fa7062
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
uppsrc/Core/Convert.hpp
View file

@ -2,7 +2,7 @@ template <typename CHAR, typename BYTE>
force_inline
void SkipSpaces__(const CHAR *&s)
{
while((BYTE)*s <= ' ') s++;
while(*s && (BYTE)*s <= ' ') s++;
}
template <typename CHAR, typename BYTE>
@ -44,7 +44,7 @@ const CHAR *ScanUint0(UINT& result, const CHAR *s, bool& overflow)
const int base4 = base * base3;
for(;;) {
UINT n0 = n;
auto CheckOverflow = [&] { if(n0 > n) overflow = true; };
auto CheckOverflow = [&](UINT n1) { if(n0 > n1) overflow = true; };
if(c1 < 0 || c1 >= base) {
result = n;
return s;
@ -52,23 +52,23 @@ const CHAR *ScanUint0(UINT& result, const CHAR *s, bool& overflow)
int c2 = Get(1);
if(c2 < 0 || c2 >= base) {
result = base * n + c1;
CheckOverflow();
CheckOverflow(result);
return s + 1;
}
int c3 = Get(2);
if(c3 < 0 || c3 >= base) {
result = base2 * n + base * c1 + c2;
CheckOverflow();
CheckOverflow(result);
return s + 2;
}
int c4 = Get(3);
if(c4 < 0 || c4 >= base) {
result = base3 * n + base2 * c1 + base * c2 + c3;
CheckOverflow();
CheckOverflow(result);
return s + 3;
}
n = base4 * n + base3 * c1 + base2 * c2 + base * c3 + c4;
CheckOverflow();
CheckOverflow(n);
s += 4;
c1 = Get(0);
}
@ -99,13 +99,15 @@ const CHAR *ScanInt(INT& result, const CHAR *s, bool& overflow)
int sgn = ScanSgn__<CHAR, BYTE>(s);
UINT uresult;
s = ScanUint0<CHAR, BYTE, UINT, base>(uresult, s, overflow);
if(sgn < 0) {
result = INT(sgn * uresult);
if(result > 0) overflow = true;
}
else {
result = INT(uresult);
if(result < 0) overflow = true;
if(s) {
if(sgn < 0) {
result = INT(sgn * uresult);
if(result > 0) overflow = true;
}
else {
result = INT(uresult);
if(result < 0) overflow = true;
}
}
return s;
}