repair handles invalid objects better

1 files changed, 20 insertions, 2 deletions

diff --git a/tools/dump.cpp b/tools/dump.cpp
index c919f31cab4..1e696edf3a0 100644
--- a/tools/dump.cpp
+++ b/tools/dump.cpp
@@ -185,8 +185,26 @@ public:
             }
             log(1) << loc << endl;
             Record* rec = loc.rec();
-            log(1) << loc.obj() << endl;
-            w( loc.obj() );
+            BSONObj obj;
+            try {
+                obj = loc.obj();
+                assert( obj.valid() );
+                LOG(1) << obj << endl;
+                w( obj );
+            }
+            catch ( std::exception& e ) {
+                log() << "found invalid document @ " << loc << " " << e.what() << endl;
+                if ( ! obj.isEmpty() ) {
+                    try {
+                        BSONElement e = obj.firstElement();
+                        stringstream ss;
+                        ss << "first element: " << e;
+                        log() << ss.str();
+                    }
+                    catch ( std::exception& ee ) {
+                    }
+                }
+            }
             loc = forward ? rec->getNext( loc ) : rec->getPrev( loc );
         }
         return forward ? e->xnext : e->xprev;