diff options
| author | Cosmin Munteanu <cmunteanu@cloudbasesolutions.com> | 2015-09-10 15:34:30 +0300 |
|---|---|---|
| committer | Cosmin Munteanu <cmunteanu@cloudbasesolutions.com> | 2015-09-10 15:34:30 +0300 |
| commit | 727b67504d61d668d99d0e4ba7d526f415c57324 (patch) | |
| tree | 7503777280159a5abcd7f09d76e1afc7179cc7d7 | |
| parent | e1b0876cb919c35062d744f5f567416d0ca5d939 (diff) | |
Fixed protability issue
| -rw-r--r-- | wsgate/RDP.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/wsgate/RDP.cpp b/wsgate/RDP.cpp index 1471c04..08e8cfc 100644 --- a/wsgate/RDP.cpp +++ b/wsgate/RDP.cpp @@ -624,30 +624,30 @@ namespace wsgate { const uint32_t *op = reinterpret_cast<const uint32_t *>(data.data()); switch (*op) { case WSOP_CS_CREDENTIAL_JSON: - std::string infoJSON = ""; + utility::string_t infoJSON; for (int i = 1; i < data.length() / 4; i++){ infoJSON += (char)op[i]; } try{ - web::json::value jsonValue = web::json::value::parse(utility::conversions::to_string_t(infoJSON)); - utility::string_t w_host = jsonValue[L"host"].as_string(); - utility::string_t w_pcb = jsonValue[L"pcb"].as_string(); - utility::string_t w_user = jsonValue[L"user"].as_string(); - utility::string_t w_pass = jsonValue[L"pass"].as_string(); - utility::string_t w_dtsize = jsonValue[L"dtsize"].as_string(); + web::json::value jsonValue = web::json::value::parse(infoJSON); + utility::string_t w_host = jsonValue[utility::conversions::to_string_t("host")].as_string(); + utility::string_t w_pcb = jsonValue[utility::conversions::to_string_t("pcb")].as_string(); + utility::string_t w_user = jsonValue[utility::conversions::to_string_t("user")].as_string(); + utility::string_t w_pass = jsonValue[utility::conversions::to_string_t("pass")].as_string(); + utility::string_t w_dtsize = jsonValue[utility::conversions::to_string_t("dtsize")].as_string(); utility::string_t size(w_dtsize.begin(), w_dtsize.end()); WsRdpParams params; - params.fntlm = jsonValue[L"fntlm"].as_integer(); - params.nomani = jsonValue[L"nomani"].as_integer(); - params.nonla = jsonValue[L"nonla"].as_integer(); - params.notheme = jsonValue[L"notheme"].as_integer(); - params.notls = jsonValue[L"notls"].as_integer(); - params.nowallp = jsonValue[L"nowallp"].as_integer(); - params.nowdrag = jsonValue[L"nowdrag"].as_integer(); - params.perf = jsonValue[L"perf"].as_integer(); - params.port = jsonValue[L"port"].as_integer(); + params.fntlm = jsonValue[utility::conversions::to_string_t("fntlm")].as_integer(); + params.nomani = jsonValue[utility::conversions::to_string_t("nomani")].as_integer(); + params.nonla = jsonValue[utility::conversions::to_string_t("nonla")].as_integer(); + params.notheme = jsonValue[utility::conversions::to_string_t("notheme")].as_integer(); + params.notls = jsonValue[utility::conversions::to_string_t("notls")].as_integer(); + params.nowallp = jsonValue[utility::conversions::to_string_t("nowallp")].as_integer(); + params.nowdrag = jsonValue[utility::conversions::to_string_t("nowdrag")].as_integer(); + params.perf = jsonValue[utility::conversions::to_string_t("perf")].as_integer(); + params.port = jsonValue[utility::conversions::to_string_t("port")].as_integer(); if (!size.empty()) { try { |