Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit 3a9343d

Browse files
authored
Merge pull request #939 from pmem/stable-1.11
Merge changes from stable-1.11 to master
2 parents 8a89047 + eb1bc68 commit 3a9343d

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

include/libpmemobj++/experimental/radix_tree.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1752,7 +1752,7 @@ radix_tree<Key, Value, BytesView>::internal_find(const K &k) const
17521752
while (n && !n.is_leaf()) {
17531753
if (path_length_equal(key.size(), n))
17541754
n = n->embedded_entry;
1755-
else if (n->byte > key.size())
1755+
else if (n->byte >= key.size())
17561756
return nullptr;
17571757
else
17581758
n = n->child[slice_index(key[n->byte], n->bit)];

include/libpmemobj++/string_view.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#define LIBPMEMOBJ_CPP_STRING_VIEW
1111

1212
#include <algorithm>
13+
#include <cassert>
1314
#include <string>
1415

1516
#if __cpp_lib_string_view
@@ -162,6 +163,7 @@ template <typename CharT, typename Traits>
162163
inline const CharT &basic_string_view<CharT, Traits>::operator[](size_t p) const
163164
noexcept
164165
{
166+
assert(p < size());
165167
return data()[p];
166168
}
167169

utils/docker/run-doc-update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ git checkout -B ${GH_PAGES_NAME} upstream/gh-pages
5858
git clean -dfx
5959

6060
# Clean old content, since some files might have been deleted
61-
rm -r ./${VERSION}
61+
rm -rf ./${VERSION}
6262
mkdir -p ./${VERSION}/doxygen/
6363

6464
cp -fr ${ARTIFACTS_DIR}/cpp_html/* ./${VERSION}/doxygen/

0 commit comments

Comments
 (0)