From c0c480a4cb881652773e12279261675c03dcf899 Mon Sep 17 00:00:00 2001 From: aoowweenn Date: Sun, 5 Mar 2017 23:36:36 +0800 Subject: [PATCH] fixup! merge master and mv FindDevIL to cmake-modules --- code/MMDPmxParser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/MMDPmxParser.cpp b/code/MMDPmxParser.cpp index 15696711a..f115f80f8 100644 --- a/code/MMDPmxParser.cpp +++ b/code/MMDPmxParser.cpp @@ -57,7 +57,7 @@ namespace pmx std::string result; const char* sourceStart = buffer.data(); - const unsigned int targetSize = size * 3; + const unsigned int targetSize = size * 3; // enough to encode char* targetStart = new char[targetSize](); const char* targetReserved = targetStart; ConversionFlags flags = ConversionFlags::lenientConversion; @@ -70,7 +70,7 @@ namespace pmx throw DeadlyImportError( "Convert " + std::string(sourceStart) + " to UTF8 is not valid." ); } - result.assign(targetReserved, targetSize); + result.assign(targetReserved, targetStart - targetReserved); delete[] targetReserved; return result; }