commit 428c53cce7075d8171dbdf41eeafab24e8a0f7f5
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Feb 13 12:38:28 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Feb 13 12:38:28 2013 -0800
tree e1156348cbbd52c83c035dc2768877f4a2fa8617
parent ff5acee9baec82d8f779b4daca1679c2f27917fa

Fixing the problem with undecodeable protobuf messages (didn't properly ignore the message before)

Change-Id: I440b14e33573f91621d69c537bc6e31df6d13dd5

ccnx/ccnx-common.h

diff --git a/ccnx/ccnx-common.h b/ccnx/ccnx-common.h
index d1b169d..c78970b 100644
--- a/ccnx/ccnx-common.h
+++ b/ccnx/ccnx-common.h
@@ -107,7 +107,11 @@
 deserializeMsg (const Bytes &bytes)
 {
   boost::shared_ptr<Msg> retval (new Msg ());
-  retval->ParseFromArray (head (bytes), bytes.size ());
+  if (!retval->ParseFromArray (head (bytes), bytes.size ()))
+    {
+      // to indicate an error
+      return boost::shared_ptr<Msg> ();
+    }
   return retval;
 }
 
@@ -139,7 +143,11 @@
   in.push(boost::make_iterator_range(sBytes)); // source
 
   boost::shared_ptr<Msg> retval = boost::make_shared<Msg>();
-  retval->ParseFromIstream(&in);
+  if (!retval->ParseFromIstream(&in))
+    {
+      // to indicate an error
+      return boost::shared_ptr<Msg> ();
+    }
 
   return retval;
 }