X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.cc;h=a33bc6564d5cc50cedcb3bebc2dcf8400f55eba3;hb=d0c31526ac12869eed085891e3ae13e8b21072e6;hp=f4efbeb2c13bc035027cb81c12e807de9c0fbc36;hpb=ff305084cba283649a2c97e73d2608c3e4598683;p=senf.git

diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc
index f4efbeb..a33bc65 100644
--- a/senf/Packets/80221Bundle/MIHPacket.cc
+++ b/senf/Packets/80221Bundle/MIHPacket.cc
@@ -80,14 +80,18 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::MIHPacketType::nextPacketTy
 
 prefix_ std::pair<bool, std::string> senf::MIHPacketType::validate(packet p)
 {
-    if (p.data().size() < initSize())
+    try {
+        if (p.data().size() < initSize())
+            return std::make_pair(false, "truncated MIH message");
+        if (p->version() != 1)
+            return std::make_pair(false, "invalid MIH version: " + senf::str(p->version()) );
+        if (p->payloadLength() != p.size()-8)
+            return std::make_pair(false, "wrong MIH length: " + senf::str(p->payloadLength()) );
+        if (p.next(senf::nothrow))
+            return MIHMessageRegistry::instance().validate( p->messageId(), p.next());
+    } catch (senf::TruncatedPacketException e) {
         return std::make_pair(false, "truncated MIH message");
-    if (p->version() != 1)
-        return std::make_pair(false, "invalid MIH version: " + senf::str(p->version()) );
-    if (p->payloadLength() != p.size()-8)
-        return std::make_pair(false, "wrong MIH length: " + senf::str(p->payloadLength()) );
-    if (p.next(senf::nothrow))
-        return MIHMessageRegistry::instance().validate( p->messageId(), p.next());
+    }
     return std::make_pair(true, "");
 }