mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-24 19:02:59 +00:00
effectively revert ad4494cb0f
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
6208e2fd7f
commit
40fc3bf73b
1 changed files with 9 additions and 6 deletions
|
@ -1416,13 +1416,16 @@ void QByteArray::resize(int size)
|
||||||
if (!d->ref.deref())
|
if (!d->ref.deref())
|
||||||
freeData(d);
|
freeData(d);
|
||||||
d = x;
|
d = x;
|
||||||
} else if (size != d->size) {
|
} else {
|
||||||
reallocData(size);
|
if (d->ref != 1 || size > d->alloc || (size < d->size && size < d->alloc >> 1))
|
||||||
|
reallocData(qAllocMore(size, sizeof(Data)));
|
||||||
|
if (d->alloc >= size) {
|
||||||
d->size = size;
|
d->size = size;
|
||||||
if (d->data == d->array) {
|
if (d->data == d->array) {
|
||||||
d->array[size] = '\0';
|
d->array[size] = '\0';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|
Loading…
Add table
Reference in a new issue