Backout changeset 581c9b2f52c842a06cd3692c1a043a64b85c0c36

src/network/model/nix-vector.cc

@@ -311,8 +311,7 @@ NixVector::Deserialize (const uint32_t* buffer, uint32_t size)
 
   // return zero if an entire nix-vector was 
   // not deserialized
-  // This check is obviated by prior assert
-  return 1;
+  return (sizeCheck != 0) ? 0 : 1;
 }
 
 void

src/network/model/packet-metadata.cc

@@ -1349,9 +1349,7 @@ PacketMetadata::Deserialize (const uint8_t* buffer, uint32_t size)
       UpdateTail (tmp);
     }
   NS_ASSERT (desSize == 0);
-  // Return zero if entire meta data was not deserialized
-  // This check is obviated by prior assert
-  return 1;
+  return (desSize !=0) ? 0 : 1;
 }
 
 uint8_t*