generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-19 08:46:41 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a hard to debug crash on OS X related to sscanf format strings.

Browse Source 
See here for more info:
    http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html
This commit is contained in:
Aaron Jacobs 2011-05-24 00:41:12 +00:00
parent d21c256fae
commit 73911f2e33
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib_json/json_reader.cpp
View File

@ -610,17 +610,25 @@ 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_);
// 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 ) if ( length <= bufferSize )
{ {
Char buffer[bufferSize+1]; 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 )