src: fix debug crash handling null strings

When internal debug is enabled, output null strings as "(null)" rather than crashing, matching glibc's behavior. PR-URL: #31523 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Denys Otrishko <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Mar 15, 2020 · c8d71ca · c8d71ca
1 parent 8ecac02
commit c8d71ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/debug_utils-inl.h b/src/debug_utils-inl.h
@@ -21,7 +21,9 @@ struct ToStringHelper {
                 enable_if<std::is_arithmetic<T>::value, bool>::type,
             typename dummy = bool>
   static std::string Convert(const T& value) { return std::to_string(value); }
-  static std::string Convert(const char* value) { return value; }
+  static std::string Convert(const char* value) {
+    return value != nullptr ? value : "(null)";
+  }
   static std::string Convert(const std::string& value) { return value; }
   static std::string Convert(bool value) { return value ? "true" : "false"; }
 };

diff --git a/test/cctest/test_util.cc b/test/cctest/test_util.cc
@@ -281,6 +281,7 @@ TEST(UtilTest, SPrintF) {
   const char* bar = "bar";
   EXPECT_EQ(SPrintF("%s %s", foo, "bar"), "foo bar");
   EXPECT_EQ(SPrintF("%s %s", foo, bar), "foo bar");
+  EXPECT_EQ(SPrintF("%s", nullptr), "(null)");
 
   EXPECT_EQ(SPrintF("[%% %s %%]", foo), "[% foo %]");