From fb7927d32677506c70977f10a885a02b6b7c1506 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 17 Sep 2013 13:28:19 -0700
Subject: [PATCH] cleanup check for attached socket

---
 libraries/shared/src/Assignment.cpp | 40 +++++++++++++----------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/libraries/shared/src/Assignment.cpp b/libraries/shared/src/Assignment.cpp
index 55837e4107..3a02408a7b 100644
--- a/libraries/shared/src/Assignment.cpp
+++ b/libraries/shared/src/Assignment.cpp
@@ -67,34 +67,30 @@ Assignment::Assignment(const unsigned char* dataBuffer, int numBytes) :
     memcpy(&_type, dataBuffer + numBytesRead, sizeof(Assignment::Type));
     numBytesRead += sizeof(Assignment::Type);
     
-    if (numBytes > numBytesRead) {
+    if (_command != Assignment::RequestCommand) {
+        sockaddr* newSocket = NULL;
         
-        if (_command != Assignment::RequestCommand) {
-            sockaddr* newSocket = NULL;
+        if (dataBuffer[numBytesRead++] == IPv4_ADDRESS_DESIGNATOR) {
+            // IPv4 address
+            newSocket = (sockaddr*) new sockaddr_in;
+            numBytesRead += unpackSocket(dataBuffer + numBytesRead, newSocket);
             
-            if (dataBuffer[numBytesRead++] == IPv4_ADDRESS_DESIGNATOR) {
-                // IPv4 address
-                newSocket = (sockaddr*) new sockaddr_in;
-                numBytesRead += unpackSocket(dataBuffer + numBytesRead, newSocket);
-                
-                if (_command == Assignment::CreateCommand) {
-                    delete _attachedLocalSocket;
-                    _attachedLocalSocket = newSocket;
-                } else {
-                    delete _attachedPublicSocket;
-                    _attachedPublicSocket = newSocket;
-                }
+            if (_command == Assignment::CreateCommand) {
+                delete _attachedLocalSocket;
+                _attachedLocalSocket = newSocket;
             } else {
-                // IPv6 address, or bad designator
-                qDebug("Received a socket that cannot be unpacked!\n");
+                delete _attachedPublicSocket;
+                _attachedPublicSocket = newSocket;
             }
+        } else {
+            // IPv6 address, or bad designator
+            qDebug("Received a socket that cannot be unpacked!\n");
         }
-        
+    }
+    
+    if (numBytes > numBytesRead) {
         _numPayloadBytes = numBytes - numBytesRead;
-        
-        if (_numPayloadBytes > 0) {
-            memcpy(_payload, dataBuffer + numBytesRead, numBytes - numBytesRead);
-        }
+        memcpy(_payload, dataBuffer + numBytesRead, numBytes - numBytesRead);
     }
 }