diff --git a/arangod/Aql/QueryResult.h b/arangod/Aql/QueryResult.h index 839123ca97..8107d0b70d 100644 --- a/arangod/Aql/QueryResult.h +++ b/arangod/Aql/QueryResult.h @@ -52,7 +52,7 @@ struct QueryResult { other.warnings = nullptr; other.json = nullptr; - other.stats = other.stats; + other.stats = nullptr; other.profile = nullptr; other.clusterplan = nullptr; } diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp index 87418874d9..39dd898171 100644 --- a/arangod/V8Server/v8-vocbase.cpp +++ b/arangod/V8Server/v8-vocbase.cpp @@ -1329,10 +1329,12 @@ static void JS_ExecuteAql(v8::FunctionCallbackInfo const& args) { result->ForceSet(TRI_V8_ASCII_STRING("json"), queryResult.result); - VPackSlice stats = queryResult.stats->slice(); - if (!stats.isNone()) { - result->ForceSet(TRI_V8_ASCII_STRING("stats"), - TRI_VPackToV8(isolate, stats)); + if (queryResult.stats != nullptr) { + VPackSlice stats = queryResult.stats->slice(); + if (!stats.isNone()) { + result->ForceSet(TRI_V8_ASCII_STRING("stats"), + TRI_VPackToV8(isolate, stats)); + } } if (queryResult.profile != nullptr) { result->ForceSet(TRI_V8_ASCII_STRING("profile"),