From 5c34c2608079b12f7f3164347152dbb6fa96dda5 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 20 Jun 2020 02:55:25 -0500 Subject: [PATCH] [ox/mc] Fix string allocation size --- deps/ox/src/ox/mc/test/tests.cpp | 2 +- deps/ox/src/ox/mc/write.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/ox/src/ox/mc/test/tests.cpp b/deps/ox/src/ox/mc/test/tests.cpp index a91e53dd..72c1e761 100644 --- a/deps/ox/src/ox/mc/test/tests.cpp +++ b/deps/ox/src/ox/mc/test/tests.cpp @@ -143,7 +143,7 @@ std::map tests = { testIn.Struct.String = "Test String 2"; oxAssert(ox::writeMC(buff, buffLen, &testIn), "writeMC failed"); - oxAssert(ox::readMC(buff, buffLen, &testOut), "writeMC failed"); + oxAssert(ox::readMC(buff, buffLen, &testOut), "readMC failed"); //std::cout << testIn.Union.Int << "|" << testOut.Union.Int << "|\n"; oxAssert(testIn.Bool == testOut.Bool, "Bool value mismatch"); diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index 60e23e1f..8d6de382 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -185,7 +185,7 @@ template for (std::size_t i = 0; i < len; i++) { auto &key = keys[i]; const auto keyLen = ox_strlen(key); - auto wkey = static_cast(ox_alloca(keyLen)); + auto wkey = static_cast(ox_alloca(keyLen + 1)); memcpy(wkey, key.c_str(), keyLen + 1); oxReturnError(writer.field("", SerStr(&wkey, keyLen))); oxReturnError(writer.field("", &(*val)[key]));