return error for src too small

Change-Id: I745f447fb22a843257d1ae211a130cd39dad4ccc
garymm · Mar 10, 2024 · 8783255 · 8783255
1 parent dada981
commit 8783255
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/decompress.cpp b/src/decompress.cpp
@@ -54,11 +54,9 @@ auto decompress(std::span<const std::byte> src, std::span<std::byte> dst)
       if (len != static_cast<std::uint16_t>(~nlen)) {
         return DecompressStatus::NoCompressionLenMismatch;
       }
-      // TODO: should we return an error instead of assert?
-      assert(
-          std::cmp_greater_equal(
-              src_bits.size(), std::size_t{len} * CHAR_BIT) and
-          "not enough bits in src");
+      if (src_bits.size() < std::size_t{len} * std::size_t{CHAR_BIT}) {
+        return DecompressStatus::SrcTooSmall;
+      }
 
       if (dst.size() < len) {
         return DecompressStatus::DstTooSmall;

diff --git a/src/decompress.hpp b/src/decompress.hpp
@@ -17,6 +17,7 @@ enum class DecompressStatus : std::uint8_t
   InvalidBlockHeader,
   NoCompressionLenMismatch,
   DstTooSmall,
+  SrcTooSmall,
 };
 
 namespace detail {

diff --git a/src/test/decompress_test.cpp b/src/test/decompress_test.cpp
@@ -115,10 +115,13 @@ auto main(int, char* argv[]) -> int
 
     std::array<std::byte, expected.size()> dst_array{};
     std::span<std::byte> dst_too_small{dst_array.data(), dst_array.size() - 1};
-    const auto status_too_small = decompress(src, dst_too_small);
-    expect(status_too_small == DecompressStatus::DstTooSmall);
+    const auto status_dst_too_small = decompress(src, dst_too_small);
+    expect(status_dst_too_small == DecompressStatus::DstTooSmall);
 
     std::span<std::byte> dst{dst_array};
+    const auto status_src_too_small = decompress(src.subspan(0, 5), dst);
+    expect(status_src_too_small == DecompressStatus::SrcTooSmall);
+
     const auto status = decompress(src, dst);
     expect(status == DecompressStatus::Success);
     expect(std::ranges::equal(dst, expected));