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

Report a couple error cases in blobstore URL parsing when dealing with numbers.

This commit is contained in:
A.J. Beamon 2017-09-29 17:58:49 -07:00
parent a1f8b546e6
commit 38616424f6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fdbrpc/BlobStore.actor.cpp
View File

@ -152,7 +152,11 @@ Reference<BlobStoreEndpoint> BlobStoreEndpoint::fromString(std::string const &ur
// The items are comma separated.
std::string host;
std::vector<NetworkAddress> addrs;
uint16_t portNum = (uint16_t)strtoul(port.toString().c_str(), NULL, 10);
char *end;
uint16_t portNum = (uint16_t)strtoul(port.toString().c_str(), &end, 10);
if(*end) {
throw format("%s is not a valid port", port.toString().c_str());
}
tokenizer h(hosts);
while(1) {
@ -175,8 +179,9 @@ Reference<BlobStoreEndpoint> BlobStoreEndpoint::fromString(std::string const &ur
if(name.size() == 0)
break;
StringRef value = t.tok("&");
int ivalue = strtol(value.toString().c_str(), NULL, 10);
if(ivalue == 0)
char *valueEnd;
int ivalue = strtol(value.toString().c_str(), &valueEnd, 10);
if(*valueEnd || ivalue == 0)
throw format("%s is not a valid value for %s", value.toString().c_str(), name.toString().c_str());
if(!knobs.set(name, ivalue))
throw format("%s is not a valid parameter name", name.toString().c_str());