From 0b13b01e7704bbf8c5371efa207d930ba5e5a769 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 11 Nov 2015 17:03:36 +0100 Subject: [PATCH 1/3] fixed potentially invalid pointer access --- arangod/VocBase/document-collection.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arangod/VocBase/document-collection.h b/arangod/VocBase/document-collection.h index 1dc9515365..a58b305357 100644 --- a/arangod/VocBase/document-collection.h +++ b/arangod/VocBase/document-collection.h @@ -212,12 +212,12 @@ struct TRI_doc_mptr_t { if (marker->_type == TRI_DOC_MARKER_KEY_DOCUMENT || marker->_type == TRI_DOC_MARKER_KEY_EDGE) { auto offset = (reinterpret_cast(marker))->_offsetJson; - return static_cast(_dataptr) + offset; + return reinterpret_cast(marker) + offset; } else if (marker->_type == TRI_WAL_MARKER_DOCUMENT || marker->_type == TRI_WAL_MARKER_EDGE) { auto offset = (reinterpret_cast(marker))->_offsetJson; - return static_cast(_dataptr) + offset; + return reinterpret_cast(marker) + offset; } TRI_ASSERT(false); From edae30a8302ac9c3f9f5c0fb4e1d55167174df98 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 11 Nov 2015 17:18:20 +0100 Subject: [PATCH 2/3] updated CHANGELOG --- CHANGELOG | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 784b5646c0..31b4d697d8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -98,9 +98,18 @@ v2.8.0 (XXXX-XX-XX) of AQL queries -v2.7.1 (XXXX-XX-XX) +v2.7.2 (XXXX-XX-XX) ------------------- +* fixed potentially invalid pointer access in shaper when the currently accessed + document got re-located by the WAL collector at the very same time + + +v2.7.1 (2015-11-07) +------------------- + +* switch to linenoise next generation + * exclude `_apps` collection from replication The slave has its own `_apps` collection which it populates on server start. From 308e343a673fc5f5317d6ec1f74a7e1fc28226d1 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 11 Nov 2015 17:24:39 +0100 Subject: [PATCH 3/3] updated devel CHANGELOG --- CHANGELOG | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 31b4d697d8..4b34fff879 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -652,7 +652,14 @@ v2.7.0-rc1 (2015-09-17) The "Applications" tab in the web interfaces has been renamed to "Services". -v2.6.10 (XXXX-XX-XX) +v2.6.11 (XXXX-XX-XX) +-------------------- + +* fixed potentially invalid pointer access in shaper when the currently accessed + document got re-located by the WAL collector at the very same time + + +v2.6.10 (2015-11-10) -------------------- * disable replication appliers when starting in modes `--upgrade`, `--no-server`