Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

for some reasons fortify complained about these parts (#5777)

This commit is contained in:
Jan 2018-07-05 09:38:03 +02:00 committed by GitHub
parent 208914e3d7
commit 222f77249f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Aql/CollectBlock.cpp
View File

@ -496,7 +496,7 @@ void SortedCollectBlock::emitGroup(AqlItemBlock const* cur, AqlItemBlock* res,
res->setValue(row, _aggregateRegisters[j].first, it->stealValue()); res->setValue(row, _aggregateRegisters[j].first, it->stealValue());
} else { } else {
res->emplaceValue( res->emplaceValue(
row, _aggregateRegisters[j].first, arangodb::basics::VelocyPackHelper::NullValue()); row, _aggregateRegisters[j].first, AqlValueHintNull());
} }
++j; ++j;
} }

3
arangod/Graph/BreadthFirstEnumerator.cpp
View File

@ -184,8 +184,7 @@ arangodb::aql::AqlValue BreadthFirstEnumerator::lastEdgeToAqlValue() {
TRI_ASSERT(_lastReturned < _schreier.size()); TRI_ASSERT(_lastReturned < _schreier.size());
if (_lastReturned == 0) { if (_lastReturned == 0) {
// This is the first Vertex. No Edge Pointing to it // This is the first Vertex. No Edge Pointing to it
return arangodb::aql::AqlValue( return arangodb::aql::AqlValue(arangodb::aql::AqlValueHintNull());
arangodb::basics::VelocyPackHelper::NullValue());
} }
return _opts->cache()->fetchEdgeAqlResult(_schreier[_lastReturned]->edge); return _opts->cache()->fetchEdgeAqlResult(_schreier[_lastReturned]->edge);
} }

3
arangod/Graph/PathEnumerator.cpp
View File

@ -182,8 +182,7 @@ arangodb::aql::AqlValue DepthFirstEnumerator::lastVertexToAqlValue() {
arangodb::aql::AqlValue DepthFirstEnumerator::lastEdgeToAqlValue() { arangodb::aql::AqlValue DepthFirstEnumerator::lastEdgeToAqlValue() {
if (_enumeratedPath.edges.empty()) { if (_enumeratedPath.edges.empty()) {
return arangodb::aql::AqlValue( return arangodb::aql::AqlValue(arangodb::aql::AqlValueHintNull());
arangodb::basics::VelocyPackHelper::NullValue());
} }
// FIXME: add some asserts back into this // FIXME: add some asserts back into this
//TRI_ASSERT(_enumeratedPath.edges.back() != nullptr); //TRI_ASSERT(_enumeratedPath.edges.back() != nullptr);

1
arangod/RocksDBEngine/RocksDBKeyBounds.cpp
View File

@ -307,7 +307,6 @@ RocksDBKeyBounds::RocksDBKeyBounds(RocksDBEntryType type, uint64_t first)
_internals.push_back(static_cast<char>(_type)); _internals.push_back(static_cast<char>(_type));
uint64ToPersistent(_internals.buffer(), first); uint64ToPersistent(_internals.buffer(), first);
uint64ToPersistent(_internals.buffer(), UINT64_MAX); uint64ToPersistent(_internals.buffer(), UINT64_MAX);
break; break;
} }
case RocksDBEntryType::Document: case RocksDBEntryType::Document: