Do/wrap error checking around json reading

2017-07-28 10:03:05 -07:00
parent 6774b5d881
commit ef60ec40c3
3 changed files with 57 additions and 21 deletions
--- a/src/rpc_connection.cpp
+++ b/src/rpc_connection.cpp
@@ -114,9 +114,8 @@ bool RpcConnection::Read(JsonDocument& message)
        switch (readFrame.opcode) {
        case Opcode::Close: {
            message.ParseInsitu(readFrame.message);
-            lastErrorCode = message["code"].GetInt();
-            const auto& m = message["message"];
-            StringCopy(lastErrorMessage, m.GetString());
+            lastErrorCode = GetIntMember(&message, "code");
+            StringCopy(lastErrorMessage, GetStrMember(&message, "message", ""));
            Close();
            return false;
        }