From a9330a48f7eab6bc12b019c29186c8f1d9be843d Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Tue, 7 Feb 2017 20:03:31 +0100 Subject: [PATCH] Revert 91dc3d39f0 ('Move counter variable in processMsg into Opus condition.'). This comit (full SHA-1 is 91dc3d39f0a20644e10143d30048be64a28b6d75) is obviously flawed. So revert it. --- src/murmur/Server.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 1c3ebb545..27f90705c 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -978,6 +978,7 @@ void Server::processMsg(ServerUser *u, const char *data, int len) { return; QByteArray qba, qba_npos; + unsigned int counter; char buffer[UDP_PACKET_SIZE]; PacketDataStream pdi(data + 1, len - 1); PacketDataStream pds(buffer+1, UDP_PACKET_SIZE-1); @@ -998,9 +999,11 @@ void Server::processMsg(ServerUser *u, const char *data, int len) { } } + // Read the sequence number. + pdi >> counter; + // Skip to the end of the voice data. if ((type >> 5) != MessageHandler::UDPVoiceOpus) { - unsigned int counter; do { counter = pdi.next8(); pdi.skip(counter & 0x7f);