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: fixed segfault after accepting group invite

Browse Source 
Fix #4327
Description:
  - QString::arg call with mulpiple arguments replaced with chained
    QString::arg calls;
  - dynamic memory allocation for array of names replaced with
    allocation on the stack, unfortunately I do not notice this while
    making Core refactoring.
Also code style is formatted with script
This commit is contained in:
noavarice 2017-04-12 20:38:14 +03:00
parent 6de129fef1
commit 532e05cb0f
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/core.cpp
View File

@ -535,7 +535,7 @@ void Core::onGroupNamelistChange(Tox*, uint32_t groupId, uint32_t peerId,
CoreAV::invalidateGroupCallPeerSource(groupId, peerId); CoreAV::invalidateGroupCallPeerSource(groupId, peerId);
} }
qDebug() << QString("Group namelist change %1:%2 %3").arg(groupId, peerId, change); qDebug() << QString("Group namelist change %1:%2 %3").arg(groupId).arg(peerId).arg(change);
emit static_cast<Core*>(core)->groupNamelistChanged(groupId, peerId, change); emit static_cast<Core*>(core)->groupNamelistChanged(groupId, peerId, change);
} }
@ -1020,17 +1020,17 @@ QByteArray Core::getToxSaveData()
} }
// Declared to avoid code duplication // Declared to avoid code duplication
#define GET_FRIEND_PROPERTY(property, function, checkSize)\ #define GET_FRIEND_PROPERTY(property, function, checkSize) \
const size_t property##Size = function##_size(tox, ids[i], nullptr);\ const size_t property##Size = function##_size(tox, ids[i], nullptr); \
if ((!checkSize || property##Size) && property##Size != SIZE_MAX) {\ if ((!checkSize || property##Size) && property##Size != SIZE_MAX) { \
uint8_t* prop = new uint8_t[property##Size];\ uint8_t* prop = new uint8_t[property##Size]; \
if (function(tox, ids[i], prop, nullptr)) {\ if (function(tox, ids[i], prop, nullptr)) { \
QString propStr = ToxString(prop, property##Size).getQString();\ QString propStr = ToxString(prop, property##Size).getQString(); \
emit friend##property##Changed(ids[i], propStr);\ emit friend##property##Changed(ids[i], propStr); \
}\ } \
\ \
delete[] prop;\ delete[] prop; \
}\ }
void Core::loadFriends() void Core::loadFriends()
{ {
@ -1171,10 +1171,7 @@ QStringList Core::getGroupPeerNames(int groupId) const
return {}; return {};
} }
std::vector<uint8_t*> namesArray(nPeers, new uint8_t[TOX_MAX_NAME_LENGTH]);
std::vector<size_t> lengths(nPeers);
TOX_ERR_CONFERENCE_PEER_QUERY error; TOX_ERR_CONFERENCE_PEER_QUERY error;
uint32_t count = tox_conference_peer_count(tox, groupId, &error); uint32_t count = tox_conference_peer_count(tox, groupId, &error);
if (!parsePeerQueryError(error)) { if (!parsePeerQueryError(error)) {
return {}; return {};
@ -1187,17 +1184,14 @@ QStringList Core::getGroupPeerNames(int groupId) const
QStringList names; QStringList names;
for (uint32_t i = 0; i < nPeers; ++i) { for (uint32_t i = 0; i < nPeers; ++i) {
lengths[i] = tox_conference_peer_get_name_size(tox, groupId, i, &error); uint8_t name[TOX_MAX_NAME_LENGTH] = {0};
bool ok = tox_conference_peer_get_name(tox, groupId, i, namesArray[i], &error); size_t length = tox_conference_peer_get_name_size(tox, groupId, i, &error);
if (parsePeerQueryError(error) && ok) { bool ok = tox_conference_peer_get_name(tox, groupId, i, name, &error);
names.append(ToxString(namesArray[i], lengths[i]).getQString()); if (ok && parsePeerQueryError(error)) {
names.append(ToxString(name, length).getQString());
} }
} }
for (uint8_t* name : namesArray) {
delete[] name;
}
return names; return names;
} }