From 7d1e271c39c4c99b0cc1707bbfd10ae4e246c135 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sat, 4 May 2013 08:23:06 -0700
Subject: [PATCH] fix bug in bogus avatar data file

---
 interface/src/Avatar.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp
index 675d4ce1c0..3cf38f1527 100644
--- a/interface/src/Avatar.cpp
+++ b/interface/src/Avatar.cpp
@@ -1556,6 +1556,15 @@ void Avatar::readAvatarDataFromFile() {
     FILE* avatarFile = fopen(AVATAR_DATA_FILENAME, "r");
     
     if (avatarFile) {
-        fscanf(avatarFile, "%f,%f,%f %f", &_position.x, &_position.y, &_position.z, &_bodyYaw);
+        glm::vec3 readPosition;
+        float readYaw;
+        fscanf(avatarFile, "%f,%f,%f %f", &readPosition.x, &readPosition.y, &readPosition.z, &readYaw);
+
+        // make sure these values are sane
+        if (!isnan(readPosition.x) && !isnan(readPosition.y) && !isnan(readPosition.z) && !isnan(readYaw)) {
+            _position = readPosition;
+            _bodyYaw = readYaw;
+        }
+        fclose(avatarFile);
     }
 }