xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge pull request #396 from SHADE-DP/SP3-6-c-scripting 

Fixed issue with ImGui corrupting strings passed to managed data
This commit is contained in:
XiaoQiDigipen 2023-03-05 12:20:28 +08:00 committed by GitHub
parent 367c1fc77e cedd10c188
commit 29d33d45ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SHADE_Engine/src/Editor/SHEditorUI.cpp
View File

@ -308,7 +308,7 @@ namespace SHADE
const bool CHANGED = ImGui::InputText("##", &buffer[0], TEXT_FIELD_MAX_LENGTH); const bool CHANGED = ImGui::InputText("##", &buffer[0], TEXT_FIELD_MAX_LENGTH);
if (CHANGED) if (CHANGED)
{ {
value = std::string(buffer.data(), buffer.data() + TEXT_FIELD_MAX_LENGTH); value = std::string(buffer.data(), buffer.data() + std::strlen(buffer.data()));
} }
return CHANGED; return CHANGED;
} }

9
SHADE_Managed/src/Utility/Convert.cxx
View File

@ -91,12 +91,17 @@ namespace SHADE
{ {
if (str == nullptr) if (str == nullptr)
return ""; return "";
return msclr::interop::marshal_as<std::string>(str); std::string s = msclr::interop::marshal_as<std::string>(str);
s.substr(0, str->Length);
return s;
} }
System::String^ Convert::ToCLI(const std::string& str) System::String^ Convert::ToCLI(const std::string& str)
{ {
return msclr::interop::marshal_as<System::String^>(str); if (str.empty())
return "";
return msclr::interop::marshal_as<System::String^>(str)->Substring(0, str.length());
} }
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/