SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

linux PIString fix

Browse Source
This commit is contained in:
Бычков Андрей
2022-04-25 23:56:57 +03:00
parent d6ba51e4bc
commit a304997177
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/main/core/pistring.cpp
View File

@@ -234,19 +234,19 @@ void PIString::appendFromChars(const char * c, int s, const char * codepage) {
mbstate_t state; mbstate_t state;
memset(&state, 0, sizeof(state)); memset(&state, 0, sizeof(state));
const char ** pc; const char ** pc;
const char * cc_; char * c_ = nullptr;
if (s > 0) { if (s > 0) {
char c_ [s+1]; c_ = malloc(s+1);
memcpy(c_, c, s); memcpy(c_, c, s);
c_[s] = '\0'; c_[s] = '\0';
cc_ = &c_[0]; pc = &c_;
pc = &cc_;
} else { } else {
pc = &c; pc = &c;
} }
size_t len = mbsrtowcs(NULL, pc, 0, &state); size_t len = mbsrtowcs(NULL, pc, 0, &state);
wchar_t wstr[len+1]; wchar_t wstr[len+1];
mbsrtowcs(&wstr[0], pc, len+1, &state); mbsrtowcs(&wstr[0], pc, len+1, &state);
if (s > 0) free(c_);
enlarge(len); enlarge(len);
for (size_t i=0; i<len; ++i) (*this)[old_sz+i] = wstr[i]; for (size_t i=0; i<len; ++i) (*this)[old_sz+i] = wstr[i];
// //qDebug() << "FromChars done" << size(); // //qDebug() << "FromChars done" << size();