wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed checkNumber logic

This commit is contained in:
Evan Tschannen 2018-09-10 00:56:16 -07:00
parent eae698233e
commit dcbafe6b7e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fdbclient/JsonString.h
View File

@ -262,8 +262,7 @@ public:
}
write('"');
write(name);
write('"');
write(':');
write("\":");
writeValue(std::forward<VT>(val));
return *this;
}
@ -274,8 +273,7 @@ public:
}
write('"');
write(name);
write('"');
write(':');
write("\":");
CheckNumberResult res = checkNumber(val);
if(res == CHECKNUMBER_NEEDS_ZERO_START) {
write('0');
@ -310,7 +308,6 @@ private:
CHECKNUMBER_VALID, CHECKNUMBER_NEEDS_ZERO_START, CHECKNUMBER_NEEDS_ZERO_END, CHECKNUMBER_INVALID
};
// 'raw' write methods
inline CheckNumberResult checkNumber(const char *s, int len) {
bool needsZero = false;
bool foundPeriod = false;
@ -321,8 +318,9 @@ private:
foundPeriod = true;
if(i==0) {
needsZero = true;
}
if((i==1 && foundNegative) || i==len-1) {
} else if(i==1 && foundNegative) {
return CHECKNUMBER_INVALID;
} else if(i==len-1) {
return CHECKNUMBER_NEEDS_ZERO_END;
}
} else if(i==0 && len>1 && s[i]=='-') {