fix a memleak in db._collections() on coordinator when there are no…

… access rights to a collection
arangodb · fceller · Aug 8, 2017 · Aug 8, 2017 · Aug 8, 2017 · Aug 8, 2017
commit 260a938ed2b23b6ee42582f08fce1f5d9c91263e
diff --git a/arangod/V8Server/v8-collection.cpp b/arangod/V8Server/v8-collection.cpp
@@ -3045,15 +3045,28 @@ static void JS_CollectionsVocbase(
   }
 
   std::vector<LogicalCollection*> colls;
+
+  // clean memory
+  std::function<void()> cleanup;
 
   // if we are a coordinator, we need to fetch the collection info from the
   // agency
   if (ServerState::instance()->isCoordinator()) {
+    cleanup = [&colls]() {
+      for (auto& it : colls) {
+        if (it != nullptr) {
+          delete it;
+        }
+      }
+    };
     colls = GetCollectionsCluster(vocbase);
   } else {
     colls = vocbase->collections(false);
   }
 
+  // make sure memory is cleaned up
+  TRI_DEFER(cleanup());
+
   std::sort(colls.begin(), colls.end(), [](LogicalCollection* lhs, LogicalCollection* rhs) -> bool {
     return StringUtils::tolower(lhs->name()) < StringUtils::tolower(rhs->name());
   });
@@ -3066,7 +3079,7 @@ static void JS_CollectionsVocbase(
   size_t const n = colls.size();
   size_t x = 0;
   for (size_t i = 0; i < n; ++i) {
-    auto collection = colls[i];
+    auto& collection = colls[i];
 
     if (auth->isActive() && ExecContext::CURRENT != nullptr) {
       AuthLevel level = auth->canUseCollection(ExecContext::CURRENT->user(),
@@ -3081,6 +3094,8 @@ static void JS_CollectionsVocbase(
       error = true;
       break;
     }
+    // avoid duplicate deletion
+    collection = nullptr;
     result->Set(static_cast<uint32_t>(x++), c);
   }