8000 Bug fix/aql modify cleanup by jsteemann · Pull Request #6380 · arangodb/arangodb · GitHub
[go: up one dir, main page]

Skip to content

Bug fix/aql modify cleanup #6380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 11, 2018
Prev Previous commit
Next Next commit
fix a segfault
  • Loading branch information
jsteemann committed Sep 5, 2018
commit 92d99a4c3a5cef7405e7946a3e22a4f22038785b
8 changes: 8 additions & 0 deletions arangod/Aql/ModificationBlocks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,19 @@ bool ModificationBlock::skipEmptyValues(VPackSlice values,
AqlItemBlock const* src,
AqlItemBlock* dst,
size_t& dstRow) {
TRI_ASSERT(src != nullptr);
TRI_ASSERT(_wasTaken.size() == n);

if (values.isArray() && values.length() > 0) {
return false;
}

if (dst == nullptr) {
// fast-track exit. we don't have any output to write, so we
// better try not to copy any of the register values from src to dst
return true;
}


for (size_t i = 0; i < n; ++i) {
if (_wasTaken[i]) {
Expand Down
0