Fix an overflow in format_to_n (#2029)

fmtlib · Nov 18, 2020 · 2c734c9 · 2c734c9
1 parent 6cdd1be
commit 2c734c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/include/fmt/core.h b/include/fmt/core.h
@@ -766,7 +766,7 @@ class fixed_buffer_traits {
   explicit fixed_buffer_traits(size_t limit) : limit_(limit) {}
   size_t count() const { return count_; }
   size_t limit(size_t size) {
-    size_t n = limit_ - count_;
+    size_t n = limit_ > count_ ? limit_ - count_ : 0;
     count_ += size;
     return size < n ? size : n;
   }

diff --git a/test/format-test.cc b/test/format-test.cc
@@ -2031,6 +2031,11 @@ TEST(FormatTest, FormatToN) {
   result = fmt::format_to_n(buffer, 4, "{}", "ABCDE");
   EXPECT_EQ(5u, result.size);
   EXPECT_EQ("ABCD", fmt::string_view(buffer, 4));
+
+  buffer[3] = 'x';
+  result = fmt::format_to_n(buffer, 3, "{}", std::string(1000, '*'));
+  EXPECT_EQ(1000u, result.size);
+  EXPECT_EQ("***x", fmt::string_view(buffer, 4));
 }
 
 TEST(FormatTest, WideFormatToN) {