mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
Fix String concatenation dereference bug
This commit is contained in:
@ -640,7 +640,7 @@ plString plString::Substr(int start, size_t size) const
|
|||||||
|
|
||||||
// Don't re-check UTF-8 on this
|
// Don't re-check UTF-8 on this
|
||||||
plString str;
|
plString str;
|
||||||
str.fUtf8Buffer.Steal(substr, size);
|
str.fUtf8Buffer = plStringBuffer<char>::Steal(substr, size);
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -651,7 +651,7 @@ plString &plString::operator+=(const plString &str)
|
|||||||
memcpy(catstr, s_str(), GetSize());
|
memcpy(catstr, s_str(), GetSize());
|
||||||
memcpy(catstr + GetSize(), str.s_str(), str.GetSize());
|
memcpy(catstr + GetSize(), str.s_str(), str.GetSize());
|
||||||
catstr[catsize] = 0;
|
catstr[catsize] = 0;
|
||||||
fUtf8Buffer.Steal(catstr, catsize);
|
fUtf8Buffer = plStringBuffer<char>::Steal(catstr, catsize);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -665,7 +665,7 @@ plString operator+(const plString &left, const plString &right)
|
|||||||
|
|
||||||
// Don't re-check UTF-8 on this
|
// Don't re-check UTF-8 on this
|
||||||
plString str;
|
plString str;
|
||||||
str.fUtf8Buffer.Steal(catstr, catsize);
|
str.fUtf8Buffer = plStringBuffer<char>::Steal(catstr, catsize);
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user