mds: catch exceptions in ::decode

...and translate them into more readily handlable -EINVALs

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mds/JournalPointer.cc b/src/mds/JournalPointer.cc
index 0ceb758a9b7540e0b40fc396643e7590ed91c80b..68e8aa4877273923b190e45ade14cdcd579e595e 100644 (file)
--- a/src/mds/JournalPointer.cc
+++ b/src/mds/JournalPointer.cc
@@ -56,7 +56,11 @@ int JournalPointer::load(Objecter *objecter)
   // Construct JournalPointer result, null or decoded data
   if (r == 0) {
     bufferlist::iterator q = data.begin();
-    decode(q);
+    try {
+      decode(q);
+    } catch (const buffer::error &e) {
+      return -EINVAL;
+    }
   } else {
     dout(1) << "Journal pointer '" << object_id << "' read failed: " << cpp_strerror(r) << dendl;
   }