]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
FileStore.cc: Make sure str-pointer has not 0x0 when referenced
authorWillem Jan Withagen <wjw@digiware.nl>
Tue, 26 Apr 2016 15:09:22 +0000 (17:09 +0200)
committerWillem Jan Withagen <wjw@digiware.nl>
Tue, 26 Apr 2016 15:09:22 +0000 (17:09 +0200)
ceph-osd crashes on reference to where if it is not get_index or lfn_find.
So init with an "empty" indicator "()

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
src/os/filestore/FileStore.cc

index 95d7bc08739b8ecfaefddc9b60345764a8399f1a..eef82b72618d61b1031f588cbcc6fd739ec0f6f7 100644 (file)
@@ -4929,7 +4929,7 @@ int FileStore::omap_get_values(const coll_t& _c, const ghobject_t &hoid,
   const coll_t& c = !_need_temp_object_collection(_c, hoid) ? _c : _c.get_temp();
   dout(15) << __func__ << " " << c << "/" << hoid << dendl;
   Index index;
-  const char *where = 0;
+  const char *where = "()";
   int r = get_index(c, &index);
   if (r < 0) {
     where = " (get_index)";