ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Json::Reader::decodeDouble

Browse Source
This commit is contained in:
Vinnie Falco
2013-10-07 02:49:03 -07:00
parent 256c12f150
commit 0b69378a03
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ripple/json/impl/json_reader.cpp
View File

@@ -710,7 +710,6 @@ Reader::decodeNumber ( Token& token )
return true; return true;
} }
bool bool
Reader::decodeDouble( Token &token ) Reader::decodeDouble( Token &token )
{ {
@@ -718,28 +717,36 @@ Reader::decodeDouble ( Token& token )
const int bufferSize = 32; const int bufferSize = 32;
int count; int count;
int length = int(token.end_ - token.start_); int length = int(token.end_ - token.start_);
// Sanity check to avoid buffer overflow exploits.
if ( length < bufferSize ) if (length < 0) {
return addError( "Unable to parse token length", token );
}
// Avoid using a string constant for the format control string given to
// sscanf, as this can cause hard to debug crashes on OS X. See here for more
// info:
//
// http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html
char format[] = "%lf";
if ( length <= bufferSize )
{ {
Char buffer[bufferSize]; Char buffer[bufferSize+1];
memcpy( buffer, token.start_, length ); memcpy( buffer, token.start_, length );
buffer[length] = 0; buffer[length] = 0;
count = sscanf ( buffer, "%lf", &value ); count = sscanf( buffer, format, &value );
} }
else else
{ {
std::string buffer( token.start_, token.end_ ); std::string buffer( token.start_, token.end_ );
count = sscanf ( buffer.c_str (), "%lf", &value ); count = sscanf( buffer.c_str(), format, &value );
} }
if ( count != 1 ) if ( count != 1 )
return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token ); return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
currentValue() = value; currentValue() = value;
return true; return true;
} }
bool bool
Reader::decodeString ( Token& token ) Reader::decodeString ( Token& token )
{ {