Merge pull request #928 from igchor/fix_comparison

lukaszstolarczuk · web-flow · commit eb1bc681a256 · 2020-10-13T09:31:20.000+02:00
radix_tree: fix internal find
diff --git a/include/libpmemobj++/experimental/radix_tree.hpp b/include/libpmemobj++/experimental/radix_tree.hpp
@@ -1746,7 +1746,7 @@ radix_tree<Key, Value, BytesView>::internal_find(const K &k) const
 	while (n && !n.is_leaf()) {
 		if (path_length_equal(key.size(), n))
 			n = n->embedded_entry;
-		else if (n->byte > key.size())
+		else if (n->byte >= key.size())
 			return nullptr;
 		else
 			n = n->child[slice_index(key[n->byte], n->bit)];
diff --git a/include/libpmemobj++/string_view.hpp b/include/libpmemobj++/string_view.hpp
@@ -10,6 +10,7 @@
 #define LIBPMEMOBJ_CPP_STRING_VIEW
 
 #include <algorithm>
+#include <cassert>
 #include <string>
 
 #if __cpp_lib_string_view
@@ -161,6 +162,7 @@ template <typename CharT, typename Traits>
 inline const CharT &basic_string_view<CharT, Traits>::operator[](size_t p) const
 	noexcept
 {
+	assert(p < size());
 	return data()[p];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`#define LIBPMEMOBJ_CPP_STRING_VIEW`
`11`	`11`
`12`	`12`	`#include <algorithm>`
	`13`	`+#include <cassert>`
`13`	`14`	`#include <string>`
`14`	`15`
`15`	`16`	`#if __cpp_lib_string_view`
`@@ -161,6 +162,7 @@ template <typename CharT, typename Traits>`
`161`	`162`	`inline const CharT &basic_string_view<CharT, Traits>::operator[](size_t p) const`
`162`	`163`	`noexcept`
`163`	`164`	`{`
	`165`	`+ assert(p < size());`
`164`	`166`	`return data()[p];`
`165`	`167`	`}`
`166`	`168`