--- a/src/internet/model/icmpv6-header.cc	Wed May 15 10:10:26 2013 -0400
+++ b/src/internet/model/icmpv6-header.cc	Wed May 15 11:16:59 2013 -0400
@@ -1705,6 +1705,7 @@
 
   SetType (i.ReadU8 ());
   SetLength (i.ReadU8 ());
+  NS_ASSERT (GetLength () * 8 - 2 <= 32);
   i.Read (mac, (GetLength () * 8) - 2);
 
   m_addr.CopyFrom (mac, (GetLength () * 8)-2);