From 1309af6d7a7d7f03601d8f34c69a762058dfab97 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Tue, 24 Jan 2017 12:47:47 -0800
Subject: [PATCH] CR feedback

---
 assignment-client/src/avatars/AvatarMixerClientData.h | 4 +++-
 libraries/avatars/src/AvatarData.cpp                  | 5 ++---
 libraries/avatars/src/AvatarData.h                    | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h
index 7984848831..cb3ebdf99f 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.h
+++ b/assignment-client/src/avatars/AvatarMixerClientData.h
@@ -114,7 +114,9 @@ public:
     }
 
     QVector<JointData>& getLastOtherAvatarSentJoints(QUuid otherAvatar) {
-        return _lastOtherAvatarSentJoints[otherAvatar];
+        auto result = _lastOtherAvatarSentJoints[otherAvatar];
+        result.resize(_avatar->getJointCount());
+        return result;
     }
 
     
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 17f85372eb..eac21a9fe2 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -429,9 +429,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
 #endif
 
         if (sentJointDataOut) {
-            if (sentJointDataOut->size() != _jointData.size()) {
-                sentJointDataOut->resize(_jointData.size());
-            }
+            sentJointDataOut->resize(_jointData.size()); // Make sure the destination is resized before using it
         }
         float minRotationDOT = !distanceAdjust ? AVATAR_MIN_ROTATION_DOT : getDistanceBasedMinRotationDOT(viewerPosition);
 
@@ -1538,6 +1536,7 @@ void AvatarData::sendAvatarDataPacket() {
     QVector<JointData> lastSentJointData;
     {
         QReadLocker readLock(&_jointDataLock);
+        _lastSentJointData.resize(_jointData.size());
         lastSentJointData = _lastSentJointData;
     } 
     QByteArray avatarByteArray = toByteArray(dataDetail, 0, lastSentJointData);
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 9c19deae1b..c56660ca06 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -536,8 +536,11 @@ public:
 
     float getDataRate(const QString& rateName = QString(""));
 
+    int getJointCount() { return _jointData.size(); }
+
     QVector<JointData> getLastSentJointData() { 
         QReadLocker readLock(&_jointDataLock);
+        _lastSentJointData.resize(_jointData.size());
         return _lastSentJointData;
     }