瀏覽代碼

Fixed text functions fast-path for handling "%s" and "%.*s" to handle null pointers gracefully. (#7016, #3466, #6846)

ocornut 1 年之前
父節點
當前提交
7bb0a525c3
共有 2 個文件被更改,包括 11 次插入0 次删除
  1. 4 0
      docs/CHANGELOG.txt
  2. 7 0
      imgui.cpp

+ 4 - 0
docs/CHANGELOG.txt

@@ -44,6 +44,10 @@ Breaking changes:
 
 
 Other changes:
 Other changes:
 
 
+- Misc: Fixed text functions fast-path for handling "%s" and "%.*s" to handle null pointers gracefully,
+  like most printf implementations. (#7016, #3466, #6846) [@codefrog2002]
+
+
 -----------------------------------------------------------------------
 -----------------------------------------------------------------------
  VERSION 1.90.0 (Released 2023-11-15)
  VERSION 1.90.0 (Released 2023-11-15)
 -----------------------------------------------------------------------
 -----------------------------------------------------------------------

+ 7 - 0
imgui.cpp

@@ -1944,6 +1944,8 @@ void ImFormatStringToTempBufferV(const char** out_buf, const char** out_buf_end,
     if (fmt[0] == '%' && fmt[1] == 's' && fmt[2] == 0)
     if (fmt[0] == '%' && fmt[1] == 's' && fmt[2] == 0)
     {
     {
         const char* buf = va_arg(args, const char*); // Skip formatting when using "%s"
         const char* buf = va_arg(args, const char*); // Skip formatting when using "%s"
+        if (buf == NULL)
+            buf = "(null)";
         *out_buf = buf;
         *out_buf = buf;
         if (out_buf_end) { *out_buf_end = buf + strlen(buf); }
         if (out_buf_end) { *out_buf_end = buf + strlen(buf); }
     }
     }
@@ -1951,6 +1953,11 @@ void ImFormatStringToTempBufferV(const char** out_buf, const char** out_buf_end,
     {
     {
         int buf_len = va_arg(args, int); // Skip formatting when using "%.*s"
         int buf_len = va_arg(args, int); // Skip formatting when using "%.*s"
         const char* buf = va_arg(args, const char*);
         const char* buf = va_arg(args, const char*);
+        if (buf == NULL)
+        {
+            buf = "(null)";
+            buf_len = ImMin(buf_len, 6);
+        }
         *out_buf = buf;
         *out_buf = buf;
         *out_buf_end = buf + buf_len; // Disallow not passing 'out_buf_end' here. User is expected to use it.
         *out_buf_end = buf + buf_len; // Disallow not passing 'out_buf_end' here. User is expected to use it.
     }
     }