From a7616ed0f6ded464ee4715aa9eb77a5b13b04363 Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Tue, 27 Dec 2016 18:42:22 +0100
Subject: [PATCH] fix potential nullptr dereference

---
 arangod/Replication/Syncer.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/arangod/Replication/Syncer.cpp b/arangod/Replication/Syncer.cpp
index 4d2bb7505a..11ea8a3cb7 100644
--- a/arangod/Replication/Syncer.cpp
+++ b/arangod/Replication/Syncer.cpp
@@ -593,16 +593,8 @@ int Syncer::dropIndex(arangodb::velocypack::Slice const& slice) {
   TRI_voc_cid_t const cid = getCid(slice);
   std::string cnameString = getCName(slice);
 
-  // TODO
-  // Backwards compatibility. old check to nullptr, new is empty string
-  // Other api does not know yet.
-  char const* cname = nullptr;
-  if (!cnameString.empty()) {
-    cname = cnameString.c_str();
-  }
-
   try {
-    CollectionGuard guard(_vocbase, cid, std::string(cname));
+    CollectionGuard guard(_vocbase, cid, cnameString);
 
     if (guard.collection() == nullptr) {
       return TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND;