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

fix buffer overflow (#8187)

This commit is contained in:
Frank Celler 2019-02-22 11:21:02 +01:00 committed by GitHub
parent 8ce55e548f
commit 7c091c57d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3rdParty/rocksdb/v5.16.X/port/win/env_win.cc vendored
View File

@ -966,8 +966,11 @@ uint64_t WinEnvIO::NowNanos() {
QueryPerformanceCounter(&li); QueryPerformanceCounter(&li);
// Convert to nanoseconds first to avoid loss of precision // Convert to nanoseconds first to avoid loss of precision
// and divide by frequency // and divide by frequency
li.QuadPart *= std::nano::den; if (perf_counter_frequency_ < std::nano::den) {
li.QuadPart /= perf_counter_frequency_; li.QuadPart *= (std::nano::den / perf_counter_frequency_);
} else {
li.QuadPart /= (perf_counter_frequency_ / std::nano::den);
} // else
return li.QuadPart; return li.QuadPart;
} }

4
CHANGELOG
View File

@ -1,6 +1,8 @@
v3.4.4 (XXXX-XX-XX) V3.4.4 (2019-XX-XX)
------------------- -------------------
* fixed overflow in windows NowNanos in RocksDB
* fixed issue #8165: AQL optimizer does not pick up multiple Geo index * fixed issue #8165: AQL optimizer does not pick up multiple Geo index
* when creating a new database with an initial user, set the database permission * when creating a new database with an initial user, set the database permission