commit 43bf6bbfa3d0aeee97033e1b069c94d5114e8ff4
author Eric Newberry <enewberry@email.arizona.edu> Fri Oct 09 16:12:09 2015 -0700
committer Eric Newberry <enewberry@email.arizona.edu> Fri Oct 09 23:58:54 2015 -0700
tree 09990073069cad55c462d0a511390bf768aa5580
parent f8f63da234e138025a5a8f1a6ddcb2c73d3c8cd0

lp: Packet::wireDecode checks TLV-TYPE of Block before decoding

refs #3256

Change-Id: Ia0fe8f88416eeecf969cc1a585e3625efe42e866

src/lp/packet.cpp

diff --git a/src/lp/packet.cpp b/src/lp/packet.cpp
index 82b7821..c839666 100644
--- a/src/lp/packet.cpp
+++ b/src/lp/packet.cpp
@@ -97,6 +97,10 @@
     return;
   }
 
+  if (wire.type() != tlv::LpPacket) {
+    BOOST_THROW_EXCEPTION(Error("unrecognized TLV-TYPE " + to_string(wire.type())));
+  }
+
   wire.parse();
 
   bool isFirst = true;
@@ -105,7 +109,7 @@
     detail::FieldInfo info(element.type());
 
     if (!info.isRecognized && !info.canIgnore) {
-      BOOST_THROW_EXCEPTION(Error("unknown field cannot be ignored"));
+      BOOST_THROW_EXCEPTION(Error("unrecognized field cannot be ignored"));
     }
 
     if (!isFirst) {

src/lp/packet.hpp

diff --git a/src/lp/packet.hpp b/src/lp/packet.hpp
index eed6b51..aa77a4f 100644
--- a/src/lp/packet.hpp
+++ b/src/lp/packet.hpp
@@ -60,6 +60,7 @@
 
   /**
    * \brief decode packet from wire format
+   * \throws Error unknown TLV-TYPE
    */
   void
   wireDecode(const Block& wire);

tests/unit-tests/lp/packet.t.cpp

diff --git a/tests/unit-tests/lp/packet.t.cpp b/tests/unit-tests/lp/packet.t.cpp
index 4150e0c..29ec091 100644
--- a/tests/unit-tests/lp/packet.t.cpp
+++ b/tests/unit-tests/lp/packet.t.cpp
@@ -325,6 +325,13 @@
                                 encoded.begin(), encoded.end());
 }
 
+BOOST_AUTO_TEST_CASE(DecodeUnrecognizedTlvType)
+{
+  Packet packet;
+  Block wire = encoding::makeEmptyBlock(ndn::tlv::Name);
+  BOOST_CHECK_THROW(packet.wireDecode(wire), Packet::Error);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace tests