Throw saved exception in JSON decoder

refs #7452

diff --git a/lib/base/json.cpp b/lib/base/json.cpp
index 6bcf0934331d23cd99e59f31ab800578a4f12479..318b4e24f4faabcffb58d3179f2575058863b7bc 100644 (file)
--- a/lib/base/json.cpp
+++ b/lib/base/json.cpp
@@ -177,7 +177,8 @@ public:
 
        void ThrowException(void) const
        {
-               boost::rethrow_exception(m_Exception);
+               if (m_Exception)
+                       boost::rethrow_exception(m_Exception);
        }
 
 private:
@@ -234,7 +235,7 @@ static int DecodeString(void *ctx, const unsigned char *str, size_t len)
        JsonContext *context = static_cast<JsonContext *>(ctx);
 
        try {
-               context->AddValue(String(reinterpret_cast<const char *>(str), reinterpret_cast<const char *>(str) + len));
+               context->AddValue(String(str, str + len));
        } catch (...) {
                context->SaveException();
                return 0;
@@ -329,6 +330,9 @@ Value icinga::JsonDecode(const String& data)
 
                yajl_free(handle);
 
+               /* throw saved exception (if there is one) */
+               context.ThrowException();
+
                BOOST_THROW_EXCEPTION(std::invalid_argument(msg));
        }