From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Aug 2015 19:08:55 +0000 (-0400)
Subject: os/newstore: tolerate null pnext to collection_list()
X-Git-Tag: v9.1.0~242^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=15382c50d87e5282a0133665bf7687ec2c8e2e0a;p=ceph.git

os/newstore: tolerate null pnext to collection_list()

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index a198d2ae103f..a71302767a9c 100644
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -1574,6 +1574,10 @@ int NewStore::collection_list(
   const char *pend;
   bool temp;
 
+  ghobject_t static_next;
+  if (!pnext)
+    pnext = &static_next;
+
   if (start == ghobject_t::get_max())
     goto out;
   get_coll_key_range(cid, c->cnode.bits, &temp_start_key, &temp_end_key,