diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-05-14 14:29:19 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-05-14 14:29:19 (GMT) |
| commit | a154682fc1b25581742d38dd5fe9aa06ede167b7 (patch) | |
| tree | 7574933b0cc8767a963ca1198425ba9e071374c6 /src/uscxml/Message.cpp | |
| parent | a49c068652d82ab40386bb702d0bd01e46015e7c (diff) | |
| download | uscxml-a154682fc1b25581742d38dd5fe9aa06ede167b7.zip uscxml-a154682fc1b25581742d38dd5fe9aa06ede167b7.tar.gz uscxml-a154682fc1b25581742d38dd5fe9aa06ede167b7.tar.bz2 | |
Fixed bugs and worked on MMI bridge
Diffstat (limited to 'src/uscxml/Message.cpp')
| -rw-r--r-- | src/uscxml/Message.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/uscxml/Message.cpp b/src/uscxml/Message.cpp index 8a65ed2..dbcf976 100644 --- a/src/uscxml/Message.cpp +++ b/src/uscxml/Message.cpp @@ -239,12 +239,12 @@ Data Data::fromJSON(const std::string& jsonString) { free(t); // LOG(INFO) << "Increasing JSON length to token ratio to 1/" << frac; } - t = (jsmntok_t*)malloc(nrTokens * sizeof(jsmntok_t) + 1); + t = (jsmntok_t*)malloc((nrTokens + 1) * sizeof(jsmntok_t)); if (t == NULL) { LOG(ERROR) << "Cannot parse JSON, ran out of memory!"; return data; } - memset(t, 0, nrTokens * sizeof(jsmntok_t) + 1); + memset(t, 0, (nrTokens + 1) * sizeof(jsmntok_t)); rv = jsmn_parse(&p, trimmed.c_str(), t, nrTokens); } while (rv == JSMN_ERROR_NOMEM && frac > 1); @@ -276,6 +276,7 @@ Data Data::fromJSON(const std::string& jsonString) { size_t currTok = 0; do { + jsmntok_t t2 = t[currTok]; switch (t[currTok].type) { case JSMN_STRING: dataStack.back()->type = Data::VERBATIM; |