Fix handling of null strings with the s specifier

2023-11-14 07:48:10 -10:00
parent 45e124ee43
commit 649fe0fc8b
2 changed files with 9 additions and 4 deletions
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -1531,8 +1531,12 @@ TEST(format_test, format_cstring) {
  EXPECT_EQ("test", fmt::format("{0:s}", "test"));
  char nonconst[] = "nonconst";
  EXPECT_EQ("nonconst", fmt::format("{0}", nonconst));
+  auto nullstr = static_cast<const char*>(nullptr);
  EXPECT_THROW_MSG(
-      (void)fmt::format(runtime("{0}"), static_cast<const char*>(nullptr)),
+      (void)fmt::format("{}", nullstr),
+      format_error, "string pointer is null");
+  EXPECT_THROW_MSG(
+      (void)fmt::format("{:s}", nullstr),
      format_error, "string pointer is null");
 }