g/mumlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash after channel linking.

Browse Source 
(cherry picked from commit 2617016)
This commit is contained in:
Michał Słomkowski 2015-12-14 22:44:32 +01:00
parent 9b3af96222
commit a4f511d668
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mumlib.cpp
View File

@ -87,6 +87,8 @@ namespace mumlib {
private: private:
bool processIncomingTcpMessage(MessageType messageType, uint8_t *buffer, int length) { bool processIncomingTcpMessage(MessageType messageType, uint8_t *buffer, int length) {
logger.debug("Process incoming message: type %d, length: %d.", messageType, length);
switch (messageType) { switch (messageType) {
case MessageType::VERSION: { case MessageType::VERSION: {
MumbleProto::Version version; MumbleProto::Version version;
@ -133,14 +135,19 @@ namespace mumlib {
int position = channelState.has_position() ? channelState.position() : 0; int position = channelState.has_position() ? channelState.position() : 0;
vector<uint32_t> links; vector<uint32_t> links;
std::copy(channelState.links().begin(), channelState.links().end(), links.begin()); for (int i = 0; i < channelState.links_size(); ++i) {
links.push_back(channelState.links(i));
}
vector<uint32_t> links_add; vector<uint32_t> links_add;
std::copy(channelState.links_add().begin(), channelState.links_add().end(), links_add.begin()); for (int i = 0; i < channelState.links_add_size(); ++i) {
links_add.push_back(channelState.links_add(i));
}
vector<uint32_t> links_remove; vector<uint32_t> links_remove;
std::copy(channelState.links_remove().begin(), channelState.links_remove().end(), for (int i = 0; i < channelState.links_remove_size(); ++i) {
links_remove.begin()); links_remove.push_back(channelState.links_remove(i));
}
this->channelId = channel_id; this->channelId = channel_id;