From 75ab970c0d938f2157b4ae4735dc1ae7dd69b7c7 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 17 Mar 2014 18:23:09 -0700 Subject: [PATCH] fix bug: bad offset into avatar data during decode --- interface/src/avatar/AvatarManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index 49479e903e..29b23e1f5b 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -152,6 +152,7 @@ void AvatarManager::processAvatarDataPacket(const QByteArray &datagram, const QW // only add them if mixerWeakPointer points to something (meaning that mixer is still around) while (bytesRead < datagram.size() && mixerWeakPointer.data()) { QUuid nodeUUID = QUuid::fromRfc4122(datagram.mid(bytesRead, NUM_BYTES_RFC4122_UUID)); + bytesRead += NUM_BYTES_RFC4122_UUID; AvatarSharedPointer matchingAvatar = _avatarHash.value(nodeUUID); @@ -167,7 +168,6 @@ void AvatarManager::processAvatarDataPacket(const QByteArray &datagram, const QW qDebug() << "Adding avatar with UUID" << nodeUUID << "to AvatarManager hash."; } - // have the matching (or new) avatar parse the data from the packet bytesRead += matchingAvatar->parseDataAtOffset(datagram, bytesRead); }