Avoid changes of d->cString for TQString::shared_null to make the value reliable.

This precedes unnecessary allocations, potential use after free and crashes.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/63/head
Slávek Banko 3 years ago
parent cc9271d731
commit e919ffc1ec
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -5999,6 +5999,14 @@ void TQString::setSecurityUnPaged(bool lock) {
*/
TQCString TQString::utf8() const
{
if (!d->cString) {
d->cString = new TQCString;
}
if(d == shared_null)
{
return *d->cString;
}
int l = length();
int rlen = l*3+1;
TQCString rstr(rlen);
@ -6043,11 +6051,8 @@ TQCString TQString::utf8() const
++ch;
}
rstr.truncate( cursor - (uchar*)rstr.data() );
if (!d->cString) {
d->cString = new TQCString;
}
*d->cString = rstr;
return rstr;
return *d->cString;
}
static TQChar *addOne(TQChar *qch, TQString &str)
@ -6251,6 +6256,10 @@ TQCString TQString::local8Bit() const
if (!d->cString) {
d->cString = new TQCString;
}
if(d == shared_null)
{
return *d->cString;
}
#ifdef TQT_NO_TEXTCODEC
*d->cString = TQCString(latin1());
return *d->cString;

Loading…
Cancel
Save