StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Fix Core::getPeerName for long names

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-02 23:37:54 +01:00
parent 98f15af670
commit 0d251f24fd
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core.cpp
View File

@ -1718,7 +1718,6 @@ bool Core::isPasswordSet(PasswordType passtype)
QString Core::getPeerName(const ToxID& id) const
{
uint8_t cname[TOX_MAX_NAME_LENGTH];
QString name;
CUserId cid(id.toString());
@ -1729,13 +1728,22 @@ QString Core::getPeerName(const ToxID& id) const
return name;
}
int nameSize = tox_get_name(tox, friendId, cname);
if (nameSize < 0)
const int nameSize = tox_get_name_size(tox, friendId);
if (nameSize <= 0)
{
qWarning() << "Core::getPeerName: Can't get name of friend "+QString().setNum(friendId)+" ("+id.toString()+")";
return name;
}
uint8_t* cname = new uint8_t[nameSize<TOX_MAX_NAME_LENGTH ? TOX_MAX_NAME_LENGTH : nameSize];
if (tox_get_name(tox, friendId, cname) != nameSize)
{
qWarning() << "Core::getPeerName: Can't get name of friend "+QString().setNum(friendId)+" ("+id.toString()+")";
delete[] cname;
return name;
}
name = name.fromLocal8Bit((char*)cname, nameSize);
delete[] cname;
return name;
}