From 69c1a399b4ff014a427fc2bc2ad45ffe9cfb277b Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Fri, 18 Jul 2014 16:10:56 +0200 Subject: [PATCH] Fix a wrong allocation for a TRI_aql_node_t. --- arangod/Ahuacatl/ahuacatl-ast-node.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arangod/Ahuacatl/ahuacatl-ast-node.cpp b/arangod/Ahuacatl/ahuacatl-ast-node.cpp index f9382584db..8b709d4377 100644 --- a/arangod/Ahuacatl/ahuacatl-ast-node.cpp +++ b/arangod/Ahuacatl/ahuacatl-ast-node.cpp @@ -216,10 +216,12 @@ static TRI_aql_node_t* CreateNodeUserFcall (TRI_aql_context_t* const context, //////////////////////////////////////////////////////////////////////////////// TRI_aql_node_t* TRI_CreateNodeNopAql (void) { - TRI_aql_node_t* node = (TRI_aql_node_t*) TRI_Allocate(TRI_UNKNOWN_MEM_ZONE, sizeof(TRI_aql_node_t), false); - - if (node == NULL) { - return NULL; + TRI_aql_node_t* node; + try { + node = new TRI_aql_node_t; + } + catch (std::exception&) { + return nullptr; } node->_type = TRI_AQL_NODE_NOP;