generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-27 18:30:50 +02:00
Code Issues Projects Releases Wiki Activity

use Json::RuntimeError

Browse Source
This commit is contained in:
Christopher Dunn 2015-03-08 12:43:18 -05:00
parent 9376368d86
commit 2250b3c29d
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib_json/json_reader.cpp
View File

@ -17,7 +17,6 @@
#include <sstream> #include <sstream>
#include <memory> #include <memory>
#include <set> #include <set>
#include <stdexcept>
#if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
#define snprintf _snprintf #define snprintf _snprintf
@ -148,7 +147,7 @@ bool Reader::readValue() {
// But this deprecated class has a security problem: Bad input can // But this deprecated class has a security problem: Bad input can
// cause a seg-fault. This seems like a fair, binary-compatible way // cause a seg-fault. This seems like a fair, binary-compatible way
// to prevent the problem. // to prevent the problem.
if (stackDepth_g >= stackLimit_g) throw std::runtime_error("Exceeded stackLimit in readValue()."); if (stackDepth_g >= stackLimit_g) throwRuntimeError("Exceeded stackLimit in readValue().");
++stackDepth_g; ++stackDepth_g;
Token token; Token token;
@ -1107,7 +1106,7 @@ bool OurReader::parse(const char* beginDoc,
} }
bool OurReader::readValue() { bool OurReader::readValue() {
if (stackDepth_ >= features_.stackLimit_) throw std::runtime_error("Exceeded stackLimit in readValue()."); if (stackDepth_ >= features_.stackLimit_) throwRuntimeError("Exceeded stackLimit in readValue().");
++stackDepth_; ++stackDepth_;
Token token; Token token;
skipCommentTokens(token); skipCommentTokens(token);
@ -1431,7 +1430,7 @@ bool OurReader::readObject(Token& tokenStart) {
return addErrorAndRecover( return addErrorAndRecover(
"Missing ':' after object member name", colon, tokenObjectEnd); "Missing ':' after object member name", colon, tokenObjectEnd);
} }
if (name.length() >= (1U<<30)) throw std::runtime_error("keylength >= 2^30"); if (name.length() >= (1U<<30)) throwRuntimeError("keylength >= 2^30");
if (features_.rejectDupKeys_ && currentValue().isMember(name)) { if (features_.rejectDupKeys_ && currentValue().isMember(name)) {
std::string msg = "Duplicate key: '" + name + "'"; std::string msg = "Duplicate key: '" + name + "'";
return addErrorAndRecover( return addErrorAndRecover(
@ -1994,7 +1993,7 @@ std::istream& operator>>(std::istream& sin, Value& root) {
"Error from reader: %s", "Error from reader: %s",
errs.c_str()); errs.c_str());
throw std::runtime_error("reader error"); throwRuntimeError("reader error");
} }
return sin; return sin;
} }

4
src/lib_json/json_value.cpp
View File

@ -88,7 +88,7 @@ static inline char* duplicateStringValue(const char* value,
char* newString = static_cast<char*>(malloc(length + 1)); char* newString = static_cast<char*>(malloc(length + 1));
if (newString == NULL) { if (newString == NULL) {
throw std::runtime_error( throwRuntimeError(
"in Json::Value::duplicateStringValue(): " "in Json::Value::duplicateStringValue(): "
"Failed to allocate string value buffer"); "Failed to allocate string value buffer");
} }
@ -111,7 +111,7 @@ static inline char* duplicateAndPrefixStringValue(
unsigned actualLength = length + sizeof(unsigned) + 1U; unsigned actualLength = length + sizeof(unsigned) + 1U;
char* newString = static_cast<char*>(malloc(actualLength)); char* newString = static_cast<char*>(malloc(actualLength));
if (newString == 0) { if (newString == 0) {
throw std::runtime_error( throwRuntimeError(
"in Json::Value::duplicateAndPrefixStringValue(): " "in Json::Value::duplicateAndPrefixStringValue(): "
"Failed to allocate string value buffer"); "Failed to allocate string value buffer");
} }

3
src/lib_json/json_writer.cpp
View File

@ -12,7 +12,6 @@
#include <sstream> #include <sstream>
#include <utility> #include <utility>
#include <set> #include <set>
#include <stdexcept>
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
@ -1080,7 +1079,7 @@ StreamWriter* StreamWriterBuilder::newStreamWriter() const
} else if (cs_str == "None") { } else if (cs_str == "None") {
cs = CommentStyle::None; cs = CommentStyle::None;
} else { } else {
throw std::runtime_error("commentStyle must be 'All' or 'None'"); throwRuntimeError("commentStyle must be 'All' or 'None'");
} }
std::string colonSymbol = " : "; std::string colonSymbol = " : ";
if (eyc) { if (eyc) {

1
src/test_lib_json/main.cpp
View File

@ -6,7 +6,6 @@
#include "jsontest.h" #include "jsontest.h"
#include <json/config.h> #include <json/config.h>
#include <json/json.h> #include <json/json.h>
#include <stdexcept>
#include <cstring> #include <cstring>
// Make numeric limits more convenient to talk about. // Make numeric limits more convenient to talk about.