diff --git a/external/boost/ubsan.patch.0 b/external/boost/ubsan.patch.0
index 6ff6649dd1ee..19a77856c777 100644
--- a/external/boost/ubsan.patch.0
+++ b/external/boost/ubsan.patch.0
@@ -1,4 +1,4 @@
-Work around -fsanitize=bool
+Work around -fsanitize=bool and -fsanitize=nonnull-attribute
 
 --- boost/algorithm/string/find_iterator.hpp
 +++ boost/algorithm/string/find_iterator.hpp
@@ -11,3 +11,14 @@ Work around -fsanitize=bool
              {}
  
              //! Constructor
+--- boost/circular_buffer/debug.hpp
++++ boost/circular_buffer/debug.hpp
+@@ -34,7 +34,7 @@
+ 
+ template <class T>
+ inline void do_fill_uninitialized_memory(T* data, std::size_t size_in_bytes) BOOST_NOEXCEPT {
+-    std::memset(static_cast<void*>(data), UNINITIALIZED, size_in_bytes);
++    if (size_in_bytes != 0) std::memset(static_cast<void*>(data), UNINITIALIZED, size_in_bytes);
+ }
+ 
+ template <class T>