Merge branch 'master' into docs/readme-conan

Author: baylesj

src/lib_json/json_reader.cpp

@@ -144,7 +144,12 @@ bool Reader::readValue() {
   // after calling readValue(). parse() executes one nodes_.push(), so > instead
   // of >=.
   if (nodes_.size() > stackLimit_g)
+#if JSON_USE_EXCEPTION
     throwRuntimeError("Exceeded stackLimit in readValue().");
+#else
+    // throwRuntimeError aborts. Don't abort here.
+    return false;
+#endif
 
   Token token;
   readTokenSkippingComments(token);