From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 4 Jun 2014 21:36:07 +0000 (+0200)
Subject: os/KeyValueStore.cc: fix possible null pointer deref warning
X-Git-Tag: v0.83~134^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cac902e3d396e7102fdeaa5a71782743e0f5376f;p=ceph.git

os/KeyValueStore.cc: fix possible null pointer deref warning

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>
---

diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc
index d1642edf0ade..3aa2d6780ce1 100644
--- a/src/os/KeyValueStore.cc
+++ b/src/os/KeyValueStore.cc
@@ -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,