]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds/Server.cc: check straydn before dereference
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 12 Mar 2014 19:09:22 +0000 (20:09 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 12 Mar 2014 19:09:22 +0000 (20:09 +0100)
ID 1019554 (#1 of 1): Dereference after null check (FORWARD_NULL)
 13. var_deref_model: Passing null pointer "straydn" to function
 "MDSCacheObject::is_auth() const", which dereferences it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/mds/Server.cc

index a1327662d9b2212bc6e6596ee841dde9d8b6164e..cee1ef6a3654dd976813d8208ec59f6f656e0f59 100644 (file)
@@ -6043,7 +6043,7 @@ void Server::_rename_prepare(MDRequest *mdr,
   }
 
   bool force_journal_stray = false;
-  if (oldin && oldin->is_dir() && !straydn->is_auth())
+  if (oldin && oldin->is_dir() && straydn && !straydn->is_auth())
     force_journal_stray = _need_force_journal(oldin, true);
 
   if (linkmerge)