fixed issue arangodb#6076: Segmentation fault after AQL query (arangodb#6081)

jsteemann · web-flow · commit 40edf3150e98 · 2018-08-06T14:27:07.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 v3.3.14 (XXXX-XX-XX)
 --------------------
+
+* fixed issue #6076: Segmentation fault after AQL query
+
 * fixed issue #5884: Subquery nodes are no longer created on DBServers
 
 * fixed issue #6031: Broken LIMIT in nested list iterations 
diff --git a/arangod/Cluster/ServerState.cpp b/arangod/Cluster/ServerState.cpp
@@ -55,6 +55,7 @@ static ServerState Instance;
 
 ServerState::ServerState()
     : _id(),
+      _shortId(0),
       _address(),
       _lock(),
       _role(RoleEnum::ROLE_UNDEFINED),
diff --git a/arangod/GeneralServer/RestHandler.cpp b/arangod/GeneralServer/RestHandler.cpp
@@ -29,6 +29,7 @@
 #include "Cluster/ClusterComm.h"
 #include "Cluster/ClusterInfo.h"
 #include "Cluster/ClusterMethods.h"
+#include "Cluster/ServerState.h"
 #include "GeneralServer/AuthenticationFeature.h"
 #include "GeneralServer/GeneralCommTask.h"
 #include "Logger/Logger.h"
@@ -105,6 +106,10 @@ void RestHandler::setStatistics(RequestStatistics* stat) {
 }
 
 bool RestHandler::forwardRequest() {
+  if (!ServerState::instance()->isCoordinator()) {
+    return false;
+  }
+
   // TODO refactor into a more general/customizable method
   //
   // The below is mostly copied and only lightly modified from
