]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/KeyValueStore.cc: fix possible null pointer deref warning
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 4 Jun 2014 21:36:07 +0000 (23:36 +0200)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 4 Jun 2014 21:36:07 +0000 (23:36 +0200)
Add assert check for header->header and remove redundant 'if'
check for header again later.

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

index d1642edf0ade9593da2cc312769b130768675ae3..3aa2d6780ce19014e5314e470eacf00d9e24eb85 100644 (file)
@@ -223,12 +223,11 @@ void StripObjectMap::rename_wrap(const coll_t &cid, const ghobject_t &oid,
                                  StripObjectHeader *header)
 {
   assert(header);
+  assert(header->header);
   rename(header->header, cid, oid, t);
 
-  if (header) {
-    header->oid = oid;
-    header->cid = cid;
-  }
+  header->oid = oid;
+  header->cid = cid;
 }
 
 int StripObjectMap::get_values_with_header(const StripObjectHeader &header,