From ca5f509903315a56b2f306f8644544861a6525cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Dumont?= Date: Tue, 20 Feb 2024 19:24:47 +0100 Subject: [PATCH] libstdc++: [_GLIBCXX_DEBUG] Fix std::__niter_wrap behavior In _GLIBCXX_DEBUG mode the std::__niter_base can remove 2 layers, the __gnu_debug::_Safe_iterator<> and the __gnu_cxx::__normal_iterator<>. When std::__niter_wrap is called to build a __gnu_debug::_Safe_iterator<> from a __gnu_cxx::__normal_iterator<> we then have a consistency issue as the difference between the 2 iterators will done on a __normal_iterator on one side and a C pointer on the other. To avoid this problem call std::__niter_base on both input iterators. libstdc++-v3/ChangeLog: * include/bits/stl_algobase.h (std::__niter_wrap): Add a call to std::__niter_base on res iterator. --- libstdc++-v3/include/bits/stl_algobase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 0f73da13172..d534e02871f 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -344,7 +344,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX20_CONSTEXPR inline _From __niter_wrap(_From __from, _To __res) - { return __from + (__res - std::__niter_base(__from)); } + { return __from + (std::__niter_base(__res) - std::__niter_base(__from)); } // No need to wrap, iterator already has the right type. template