Cast std::streamsize to std::size_t for fast stream copies.

evoskuil · Jan 29, 2024 · daafcf4 · daafcf4
1 parent f53df80
commit daafcf4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/include/bitcoin/system/impl/stream/iostream/iostream.ipp b/include/bitcoin/system/impl/stream/iostream/iostream.ipp
@@ -19,7 +19,10 @@
 #ifndef LIBBITCOIN_SYSTEM_STREAM_IOSTREAM_IOSTREAM_IPP
 #define LIBBITCOIN_SYSTEM_STREAM_IOSTREAM_IOSTREAM_IPP
 
+#include <algorithm>
+#include <type_traits>
 #include <bitcoin/system/define.hpp>
+#include <bitcoin/system/math/math.hpp>
 
 namespace libbitcoin {
 namespace system {
@@ -157,35 +160,39 @@ template <typename Character>
 void
 iostream<Character>::read(char_type* data, std::streamsize count) NOEXCEPT
 {
-    if (is_overflow(count))
+    const auto bytes = possible_narrow_sign_cast<size_t>(count);
+
+    if (is_overflow(bytes))
     {
         setstate(badbit);
         return;
     }
 
     BC_PUSH_WARNING(NO_UNSAFE_COPY_N)
-    std::copy_n(position_, count, data);
+    std::copy_n(position_, bytes, data);
     BC_POP_WARNING()
 
-    position_ += count;
+    position_ += bytes;
 }
 
 template <typename Character>
 void
 iostream<Character>::write(const char_type* data,
     std::streamsize count) NOEXCEPT
 {
-    if (is_overflow(count))
+    const auto bytes = possible_narrow_sign_cast<size_t>(count);
+
+    if (is_overflow(bytes))
     {
         setstate(badbit);
         return;
     }
 
     BC_PUSH_WARNING(NO_UNSAFE_COPY_N)
-    std::copy_n(data, count, position_);
+    std::copy_n(bytes, position_, data);
     BC_POP_WARNING()
 
-    position_ += count;
+    position_ += bytes;
 }
 
 template <typename Character>

diff --git a/include/bitcoin/system/impl/stream/iostream/istream.ipp b/include/bitcoin/system/impl/stream/iostream/istream.ipp
@@ -150,17 +150,19 @@ template <typename Character>
 void
 istream<Character>::read(char_type* data, std::streamsize count) NOEXCEPT
 {
-    if (is_overflow(count))
+    const auto bytes = possible_narrow_sign_cast<size_t>(count);
+
+    if (is_overflow(bytes))
     {
         setstate(badbit);
         return;
     }
 
     BC_PUSH_WARNING(NO_UNSAFE_COPY_N)
-    std::copy_n(position_, count, data);
+    std::copy_n(position_, bytes, data);
     BC_POP_WARNING()
 
-    position_ += count;
+    position_ += bytes;
 }
 
 // private

diff --git a/include/bitcoin/system/impl/stream/iostream/ostream.ipp b/include/bitcoin/system/impl/stream/iostream/ostream.ipp
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <bitcoin/system/define.hpp>
+#include <bitcoin/system/math/math.hpp>
 
 namespace libbitcoin {
 namespace system {
@@ -81,17 +82,19 @@ void
 ostream<Character>::write(const char_type* data,
     std::streamsize count) NOEXCEPT
 {
-    if (is_overflow(count))
+    const auto bytes = possible_narrow_sign_cast<size_t>(count);
+
+    if (is_overflow(bytes))
     {
         setstate(badbit);
         return;
     }
 
     BC_PUSH_WARNING(NO_UNSAFE_COPY_N)
-    std::copy_n(data, count, position_);
+    std::copy_n(bytes, position_, data);
     BC_POP_WARNING()
 
-    position_ += count;
+    position_ += bytes;
 }
 
 template <typename Character>