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

fixed undefined behavior

This commit is contained in:
jsteemann 2016-05-16 22:40:06 +02:00
parent d74e41689d
commit a222d13a56
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangod/Aql/AstNode.cpp
View File

@ -320,15 +320,15 @@ int arangodb::aql::CompareAstNodes(AstNode const* lhs, AstNode const* rhs,
}
if (lType == TRI_JSON_STRING) {
size_t maxLength =
(std::max)(lhs->getStringLength(), rhs->getStringLength());
if (compareUtf8) {
return TRI_compare_utf8(lhs->getStringValue(), lhs->getStringLength(),
rhs->getStringValue(), rhs->getStringLength());
}
size_t const minLength =
(std::min)(lhs->getStringLength(), rhs->getStringLength());
int res = memcmp(lhs->getStringValue(), rhs->getStringValue(), maxLength);
int res = memcmp(lhs->getStringValue(), rhs->getStringValue(), minLength);
if (res != 0) {
return res;