Check whether name is empty in getCollectionId{Local,Cluster} before access

Markus Pfeiffer · Markus Pfeiffer · commit bb8e85f2f8d8 · 2019-07-16T11:05:52.000+01:00
diff --git a/arangod/Utils/CollectionNameResolver.cpp b/arangod/Utils/CollectionNameResolver.cpp
@@ -70,19 +70,21 @@ std::shared_ptr<LogicalCollection> CollectionNameResolver::getCollection(std::st
 //////////////////////////////////////////////////////////////////////////////
 
 TRI_voc_cid_t CollectionNameResolver::getCollectionIdLocal(std::string const& name) const {
-  if (name[0] >= '0' && name[0] <= '9') {
+  if (name.empty()) {
+    return 0;
+  }
+
+  if (isdigit(name[0])) {
     // name is a numeric id
     return NumberUtils::atoi_zero<TRI_voc_cid_t>(name.data(), name.data() + name.size());
   }
 
   auto collection = getCollectionStruct(name);
-
   if (collection != nullptr) {
     return collection->id();
   }
 
   auto view = _vocbase.lookupView(name);
-
   if (view) {
     return view->id();
   }
@@ -101,7 +103,10 @@ TRI_voc_cid_t CollectionNameResolver::getCollectionIdCluster(std::string const&
   if (!ServerState::isRunningInCluster(_serverRole)) {
     return getCollectionIdLocal(name);
   }
-  if (name[0] >= '0' && name[0] <= '9') {
+  if (name.empty()) {
+    return 0;
+  }
+  if (isdigit(name[0])) {
     // name is a numeric id
     TRI_voc_cid_t cid =
         NumberUtils::atoi_zero<TRI_voc_cid_t>(name.data(), name.data() + name.size());
@@ -135,6 +140,7 @@ TRI_voc_cid_t CollectionNameResolver::getCollectionIdCluster(std::string const&
       return vinfo->id();
     }
   } catch (...) {
+    // TODO: ?
   }
 
   return 0;
