Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

null-termiate the string from QByteArray(const char *data) constructor

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-07-26 10:23:52 +00:00
parent 3e4c0955a9
commit 8e119e96f7
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/tools/qbytearray.cpp
View file

@ -1386,20 +1386,21 @@ void QByteArray::chop(int n)
QByteArray makes a deep copy of the string data.
*/
QByteArray::QByteArray(const char *str)
QByteArray::QByteArray(const char *data)
{
if (!str) {
int size = qstrlen(data);
if (!data) {
d = &shared_null;
} else if (!*str) {
} else if (size <= 0) {
d = &shared_empty;
} else {
int len = qstrlen(str);
d = static_cast<Data *>(malloc(sizeof(Data)+len));
d = static_cast<Data *>(malloc(sizeof(Data) + size));
Q_CHECK_PTR(d);
d->ref = 0;;
d->alloc = d->size = len;
d->ref = 0;
d->alloc = d->size = size;
d->data = d->array;
memcpy(d->array, str, len+1); // include null terminator
memcpy(d->array, data, size);
d->array[size] = '\0';
}
d->ref.ref();
}