Add fsanitize=integer to tests and fix all issues

.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
           factors: |
             gcc ASan Shared No-Threads
             msvc Shared x86
-            clang Time-Trace Fuzz ASan+UBSan
+            clang Time-Trace Fuzz ASan+UBSan IntegerSan
             mingw Shared
           trace-commands: true
 
@@ -151,9 +151,9 @@ jobs:
           echo 'CMAKE_GENERATOR_TOOLSET=${{ matrix.generator-toolset || '' }}' >> $GITHUB_ENV
           echo 'CMAKE_BUILD_TYPE=${{ matrix.build-type || '' }}' >> $GITHUB_ENV
           echo 'CC=${{ steps.setup-cpp.outputs.cc || matrix.cc || '' }}' >> $GITHUB_ENV
-          echo 'CFLAGS=${{ matrix.ccflags || '' }}' >> $GITHUB_ENV
+          echo 'CFLAGS=${{ (matrix.integersan && '-fsanitize=integer -fno-sanitize=unsigned-integer-overflow -fno-sanitize-recover=integer -fno-omit-frame-pointer') || matrix.ccflags || '' }}' >> $GITHUB_ENV
           echo 'CXX=${{ steps.setup-cpp.outputs.cxx || matrix.cxx || '' }}' >> $GITHUB_ENV
-          echo 'CXXFLAGS=${{ matrix.cxxflags || '' }}' >> $GITHUB_ENV
+          echo 'CXXFLAGS=${{ (matrix.integersan && '-fsanitize=integer -fno-sanitize=unsigned-integer-overflow -fno-sanitize-recover=integer -fno-omit-frame-pointer') || matrix.cxxflags || '' }}' >> $GITHUB_ENV
           echo 'CXXSTD=${{ matrix.latest-cxxstd || '' }}' >> $GITHUB_ENV
           echo 'BUILD_SHARED_LIBS=${{ matrix.shared || '' }}' >> $GITHUB_ENV
           echo 'CMAKE_RUN_TESTS=true' >> $GITHUB_ENV
@@ -180,11 +180,11 @@ jobs:
         if: matrix.is-no-factor-intermediary != 'true'
         with:
           source-dir: ../boost-root
-          build-dir: __build_cmake__
+          build-dir: build_cmake
           build-target: tests
           install: true
           install-prefix: .local
-          cmake-version: '>=3.15'
+          cmake-version: '>=3.20'
           extra-args: |
             -D Boost_VERBOSE=ON
             -D BOOST_INCLUDE_LIBRARIES=${{ steps.patch.outputs.module }}
@@ -200,9 +200,9 @@ jobs:
         if: matrix.is-no-factor-intermediary != 'true'
         with:
           source-dir: ../boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
-          build-dir: __build_cmake_test__
+          build-dir: build_cmake_test
           install: false
-          cmake-version: '>=3.11'
+          cmake-version: '>=3.20'
           extra-args: |
             'find_package(Boost)': -D BOOST_CI_INSTALL_TEST=ON -D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local
             'find_package(boost_url)': -D BOOST_CI_INSTALL_MODULE_TEST=ON -D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local
@@ -216,11 +216,11 @@ jobs:
         if: matrix.is-no-factor-intermediary != 'true'
         with:
           source-dir: .
-          build-dir: __build_cmake_root__
+          build-dir: build_cmake_root
           build-target: tests
           run-tests: true
           install: false
-          cmake-version: '>=3.11'
+          cmake-version: '>=3.20'
           extra-args: |
             -D BOOST_SRC_DIR="../boost-root"
             -D BOOST_URL_DISABLE_THREADS=${{ ( matrix.no-threads && 'ON' ) || 'OFF' }}
@@ -246,8 +246,11 @@ jobs:
           cxxstd: ${{ ( matrix.is-latest && ((matrix.cxxstd && format('{0},latest', matrix.cxxstd)) || 'latest' )) || matrix.cxxstd }}
           address-model: ${{ (matrix.x86 && '32') || '64' }}
           asan: ${{ matrix.asan }}
-          ubsan: ${{ matrix.ubsan }}
+          ubsan: ${{ matrix.ubsan || matrix.integersan }}
           tsan: ${{ matrix.tsan }}
+          # integer-sanitizer is passed directly as flags
+          ccflags: ${{ (matrix.integersan && '-fsanitize=integer -fno-sanitize=unsigned-integer-overflow -fno-sanitize-recover=integer -fno-omit-frame-pointer') || '' }}
+          cxxflags: ${{ (matrix.integersan && '-fsanitize=integer -fno-sanitize=unsigned-integer-overflow -fno-sanitize-recover=integer -fno-omit-frame-pointer') || '' }}
           shared: ${{ matrix.shared }}
           coverage: ${{ matrix.coverage }}
           define: ${{ (matrix.no-threads && 'BOOST_URL_DISABLE_THREADS') || '' }}
@@ -258,7 +261,7 @@ jobs:
         if: matrix.time-trace
         with:
           source-dir: ../boost-root/libs/url
-          build-dir: ../boost-root/__build_cmake__
+          build-dir: ../boost-root/build_cmake
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Codecov
@@ -273,10 +276,10 @@ jobs:
           elif command -v "gcov-${{ steps.setup-cpp.outputs.version-major }}" &> /dev/null; then
               gcov_tool="gcov-${{ steps.setup-cpp.outputs.version-major }}"
           fi
-          lcov -c -q -o "../boost-root/__build_cmake__/coverage.info" -d "../boost-root/__build_cmake__" --include "$(pwd)/../boost-root/libs/${{steps.patch.outputs.module}}/*" --gcov-tool "$gcov_tool"
+          lcov -c -q -o "../boost-root/build_cmake/coverage.info" -d "../boost-root/build_cmake" --include "$(pwd)/../boost-root/libs/${{steps.patch.outputs.module}}/*" --gcov-tool "$gcov_tool"
 
           # Upload to codecov
-          bash <(curl -s https://codecov.io/bash) -f "../boost-root/__build_cmake__/coverage.info"
+          bash <(curl -s https://codecov.io/bash) -f "../boost-root/build_cmake/coverage.info"
 
           # Summary
           echo "# Coverage" >> $GITHUB_STEP_SUMMARY

include/boost/url/detail/encode.hpp

@@ -115,8 +115,9 @@ re_encode_unsafe(
         detail::hexdigs[opt.lower_case];
     auto const encode = [end, hex](
         char*& dest,
-        unsigned char c) noexcept
+        char c0) noexcept
     {
+        auto c = static_cast<unsigned char>(c0);
         ignore_unused(end);
         *dest++ = '%';
         BOOST_ASSERT(dest != end);

include/boost/url/detail/url_impl.hpp

@@ -76,7 +76,8 @@ struct BOOST_URL_DECL url_impl : parts_base
     pct_string_view pct_get(int, int) const noexcept;
     void set_size(int, std::size_t) noexcept;
     void split(int, std::size_t) noexcept;
-    void adjust(int, int, std::size_t) noexcept;
+    void adjust_right(int first, int last, std::size_t n) noexcept;
+    void adjust_left(int first, int last, std::size_t n) noexcept;
     void collapse(int, int, std::size_t) noexcept;
 
     void apply_scheme(core::string_view) noexcept;

include/boost/url/grammar/lut_chars.hpp

@@ -116,8 +116,8 @@ class lut_chars
         unsigned char ch) noexcept
     {
         return ch == 255
-            ? construct(ch, pred(ch))
-            : construct(ch, pred(ch)) +
+            ? construct(ch, pred(static_cast<char>(ch)))
+            : construct(ch, pred(static_cast<char>(ch))) +
                 construct(pred, ch + 1);
     }
 
@@ -257,6 +257,14 @@ class lut_chars
     bool
     operator()(
         unsigned char ch) const noexcept
+    {
+        return operator()(static_cast<char>(ch));
+    }
+
+    /// @copydoc operator()(unsigned char) const
+    constexpr
+    bool
+    operator()(char ch) const noexcept
     {
         return mask_[lo(ch)] & hi(ch);
     }

src/detail/url_impl.cpp

@@ -279,7 +279,7 @@ split(
 // add n to [first, last]
 void
 url_impl::
-adjust(
+adjust_right(
     int first,
     int last,
     std::size_t n) noexcept
@@ -289,6 +289,19 @@ adjust(
         offset_[i] += n;
 }
 
+// remove n from [first, last]
+void
+url_impl::
+adjust_left(
+    int first,
+    int last,
+    std::size_t n) noexcept
+{
+    for(int i = first;
+            i <= last; ++i)
+        offset_[i] -= n;
+}
+
 // set [first, last) offset
 void
 url_impl::

src/url_base.cpp

@@ -224,12 +224,12 @@ remove_scheme()
     // (po and qo are invalidated)
     if (need_resize)
     {
-        impl_.adjust(id_user, id_end, 0 - sn);
+        impl_.adjust_left(id_user, id_end, sn);
     }
     else
     {
-        impl_.adjust(id_user, id_path, 0 - sn);
-        impl_.adjust(id_query, id_end, 0 - sn + 2 * cn);
+        impl_.adjust_left(id_user, id_path, sn);
+        impl_.adjust_left(id_query, id_end, sn - 2 * cn);
     }
     if (encode_colon)
     {
@@ -304,8 +304,8 @@ set_encoded_authority(
         dest[n - 1] = '/';
     impl_.apply_authority(a);
     if(need_slash)
-        impl_.adjust(
-            id_query, id_end, 1);
+        impl_.adjust_right(
+                id_query, id_end, 1);
     return *this;
 }
 
@@ -2023,7 +2023,7 @@ resize_impl(
     impl_.collapse(first, last,
         impl_.offset(last) + n);
     // shift (last, end) right
-    impl_.adjust(last, id_end, n);
+    impl_.adjust_right(last, id_end, n);
     s_[size()] = '\0';
     return s_ + impl_.offset(first);
 }
@@ -2063,8 +2063,7 @@ shrink_impl(
     impl_.collapse(first,  last,
         impl_.offset(last) - n);
     // shift (last, end) left
-    impl_.adjust(
-        last, id_end, 0 - n);
+    impl_.adjust_left(last, id_end, n);
     s_[size()] = '\0';
     return s_ + impl_.offset(first);
 }

test/unit/test_rule.hpp

@@ -26,13 +26,10 @@ template<class F>
 void
 for_each_char(F const& f)
 {
-    unsigned char u = 0;
-    do
+    for (int i = 0; i < 256; ++i)
     {
-        f(static_cast<
-            char>(u));
+        f(static_cast<char>(i));
     }
-    while(++u != 0);
 }
 
 template<class CharSet>
@@ -60,7 +57,7 @@ test_char_set(
     for_each_char(
     [&cs](char c)
     {
-        if(cs(0) || ! cs(c))
+        if(cs(static_cast<unsigned char>(0)) || ! cs(c))
         {
             if(cs(c))
             {