From e74e3ac8db65624df1fe06916687030f5a9ce0e9 Mon Sep 17 00:00:00 2001
From: Max Neunhoeffer <max@arangodb.com>
Date: Thu, 30 Oct 2014 14:58:34 +0100
Subject: [PATCH] Fix a use after free in RestAqlHandler.

---
 arangod/Aql/RestAqlHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arangod/Aql/RestAqlHandler.cpp b/arangod/Aql/RestAqlHandler.cpp
index 5732a06b3e..91e8c09e2e 100644
--- a/arangod/Aql/RestAqlHandler.cpp
+++ b/arangod/Aql/RestAqlHandler.cpp
@@ -841,6 +841,7 @@ void RestAqlHandler::handleUseQuery (std::string const& operation,
 
     try {
       res = query->engine()->shutdown(errorCode); // pass errorCode to shutdown
+      answerBody("stats", query->getStats());
       _queryRegistry->destroy(_vocbase, _qId, errorCode);
     }
     catch (...) {
@@ -851,7 +852,6 @@ void RestAqlHandler::handleUseQuery (std::string const& operation,
     }
     answerBody("error", res == TRI_ERROR_NO_ERROR ? Json(false) : Json(true))
               ("code", Json(static_cast<double>(res)));
-    answerBody.set("stats", query->getStats());
   }
   else {
     LOG_ERROR("Unknown operation!");