Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #961 from mihe/char-string-length 

Fix incorrect length passed to `CharString`
pull/971/head
Rémi Verschelde 2022-12-20 10:44:08 +01:00 committed by GitHub
parent c0eaadac86 1f6b0118dc
commit 104997e83e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/variant/char_string.cpp
View File

@ -226,53 +226,58 @@ String rtoss(double p_val) {
} }
CharString String::utf8() const { CharString String::utf8() const {
int size = internal::gde_interface->string_to_utf8_chars(_native_ptr(), nullptr, 0); int length = internal::gde_interface->string_to_utf8_chars(_native_ptr(), nullptr, 0);
char *cstr = memnew_arr(char, size + 1); int size = length + 1;
internal::gde_interface->string_to_utf8_chars(_native_ptr(), cstr, size + 1); char *cstr = memnew_arr(char, size);
internal::gde_interface->string_to_utf8_chars(_native_ptr(), cstr, length);
cstr[size] = '\0'; cstr[length] = '\0';
return CharString(cstr, size + 1); return CharString(cstr, length);
} }
CharString String::ascii() const { CharString String::ascii() const {
int size = internal::gde_interface->string_to_latin1_chars(_native_ptr(), nullptr, 0); int length = internal::gde_interface->string_to_latin1_chars(_native_ptr(), nullptr, 0);
char *cstr = memnew_arr(char, size + 1); int size = length + 1;
internal::gde_interface->string_to_latin1_chars(_native_ptr(), cstr, size + 1); char *cstr = memnew_arr(char, size);
internal::gde_interface->string_to_latin1_chars(_native_ptr(), cstr, length);
cstr[size] = '\0'; cstr[length] = '\0';
return CharString(cstr, size + 1); return CharString(cstr, length);
} }
Char16String String::utf16() const { Char16String String::utf16() const {
int size = internal::gde_interface->string_to_utf16_chars(_native_ptr(), nullptr, 0); int length = internal::gde_interface->string_to_utf16_chars(_native_ptr(), nullptr, 0);
char16_t *cstr = memnew_arr(char16_t, size + 1); int size = length + 1;
internal::gde_interface->string_to_utf16_chars(_native_ptr(), cstr, size + 1); char16_t *cstr = memnew_arr(char16_t, size);
internal::gde_interface->string_to_utf16_chars(_native_ptr(), cstr, length);
cstr[size] = '\0'; cstr[length] = '\0';
return Char16String(cstr, size + 1); return Char16String(cstr, length);
} }
Char32String String::utf32() const { Char32String String::utf32() const {
int size = internal::gde_interface->string_to_utf32_chars(_native_ptr(), nullptr, 0); int length = internal::gde_interface->string_to_utf32_chars(_native_ptr(), nullptr, 0);
char32_t *cstr = memnew_arr(char32_t, size + 1); int size = length + 1;
internal::gde_interface->string_to_utf32_chars(_native_ptr(), cstr, size + 1); char32_t *cstr = memnew_arr(char32_t, size);
internal::gde_interface->string_to_utf32_chars(_native_ptr(), cstr, length);
cstr[size] = '\0'; cstr[length] = '\0';
return Char32String(cstr, size + 1); return Char32String(cstr, length);
} }
CharWideString String::wide_string() const { CharWideString String::wide_string() const {
int size = internal::gde_interface->string_to_wide_chars(_native_ptr(), nullptr, 0); int length = internal::gde_interface->string_to_wide_chars(_native_ptr(), nullptr, 0);
wchar_t *cstr = memnew_arr(wchar_t, size + 1); int size = length + 1;
internal::gde_interface->string_to_wide_chars(_native_ptr(), cstr, size + 1); wchar_t *cstr = memnew_arr(wchar_t, size);
internal::gde_interface->string_to_wide_chars(_native_ptr(), cstr, length);
cstr[size] = '\0'; cstr[length] = '\0';
return CharWideString(cstr, size + 1); return CharWideString(cstr, length);
} }
String &String::operator=(const char *p_str) { String &String::operator=(const char *p_str) {