]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: avoid null deref of SimpleLock::_unstable
authorSage Weil <sage@newdream.net>
Mon, 15 Mar 2010 18:01:50 +0000 (11:01 -0700)
committerSage Weil <sage@newdream.net>
Mon, 15 Mar 2010 18:05:20 +0000 (11:05 -0700)
src/mds/SimpleLock.h

index 084cd1f33a339802c63ffb745c419bed7fe9154f..6479b28455abc092d0de7c3542cc0b96c333c717 100644 (file)
@@ -181,12 +181,14 @@ private:
     return _unstable;
   }
   void clear_more() {
-    assert(_unstable->empty());
-    delete _unstable;
-    _unstable = NULL;
+    if (_unstable) {
+      assert(_unstable->empty());
+      delete _unstable;
+      _unstable = NULL;
+    }
   }
   void try_clear_more() {
-    if (_unstable->empty()) {
+    if (_unstable && _unstable->empty()) {
       delete _unstable;
       _unstable = NULL;
     }