From a1874dc3ea134c20e4fe28b6f9bb081a5b988893 Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Tue, 25 May 2021 14:08:20 +0200
Subject: [PATCH] ImStrv: standardized code doing format copy, optimized
 ImStrStr

---
 imgui.cpp         | 21 +++++++--------
 imgui_widgets.cpp | 69 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/imgui.cpp b/imgui.cpp
index 208f69eaa..ecaf72482 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -2062,22 +2062,19 @@ const char* ImStristr(const char* haystack, const char* haystack_end, const char
     return NULL;
 }
 
-// FIXME-IMSTR: probably unneeded.
 const char* ImStrstr(ImStrv haystack, ImStrv needle)
 {
     const char un0 = (char)*needle.Begin;
-    while ((!haystack.End && *haystack.Begin) || (haystack.End && haystack.Begin < haystack.End))
+    const char* p = haystack.Begin;
+    const size_t needle_len_m1 = needle.length() - 1;
+    while (true)
     {
-        if (*haystack.Begin == un0)
-        {
-            const char* b = needle.Begin + 1;
-            for (const char* a = haystack.Begin + 1; b < needle.End; a++, b++)
-                if (*a != *b)
-                    break;
-            if (b == needle.End)
-                return haystack.Begin;
-        }
-        haystack.Begin++;
+        p = (const char*)memchr(p, un0, haystack.End - p);
+        if (p == NULL || (size_t)(haystack.End - p) - 1u < needle_len_m1)
+            return NULL;
+        if (needle_len_m1 == 0 || memcmp(p + 1, needle.Begin + 1, needle_len_m1) == 0)
+            return p;
+        p += 1;
     }
     return NULL;
 }
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 646e1e7f1..9bc15e99a 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -2603,14 +2603,20 @@ bool ImGui::DragScalar(ImStrv label, ImGuiDataType data_type, void* p_data, floa
         return false;
 
     // FIXME-IMSTR
-    char format_0[64];  // format may not end with \0
-    const char* format = format_0;
-    IM_ASSERT(format_p.End - format_p.Begin < IM_ARRAYSIZE(format_0));
-    ImStrncpy(format_0, format_p, IM_ARRAYSIZE(format_0));
-
-    // Default format string when passing NULL
+    const char* format;
+    char format_buf[64];
     if (!format_p)
+    {
+        // Default format string when passing NULL
         format = DataTypeGetInfo(data_type)->PrintFmt;
+    }
+    else
+    {
+        // Copy format string (format may not be zero-terminated)
+        format = format_buf;
+        IM_ASSERT(format_p.End - format_p.Begin < IM_ARRAYSIZE(format_buf));
+        ImStrncpy(format_buf, format_p, IM_ARRAYSIZE(format_buf));
+    }
 
     const bool hovered = ItemHoverable(frame_bb, id, g.LastItemData.ItemFlags);
     bool temp_input_is_active = temp_input_allowed && TempInputIsActive(id);
@@ -3211,13 +3217,20 @@ bool ImGui::SliderScalar(ImStrv label, ImGuiDataType data_type, void* p_data, co
         return false;
 
     // FIXME-IMSTR
-    char format_0[64];  // format may not end with \0
-    const char* format = format_0;
-    IM_ASSERT(format_p.End - format_p.Begin < IM_ARRAYSIZE(format_0));
-
-    // Default format string when passing NULL
+    const char* format;
+    char format_buf[64];
     if (!format_p)
+    {
+        // Default format string when passing NULL
         format = DataTypeGetInfo(data_type)->PrintFmt;
+    }
+    else
+    {
+        // Copy format string (format may not be zero-terminated)
+        format = format_buf;
+        IM_ASSERT(format_p.End - format_p.Begin < IM_ARRAYSIZE(format_buf));
+        ImStrncpy(format_buf, format_p, IM_ARRAYSIZE(format_buf));
+    }
 
     const bool hovered = ItemHoverable(frame_bb, id, g.LastItemData.ItemFlags);
     bool temp_input_is_active = temp_input_allowed && TempInputIsActive(id);
@@ -3383,13 +3396,20 @@ bool ImGui::VSliderScalar(ImStrv label, const ImVec2& size, ImGuiDataType data_t
         return false;
 
     // FIXME-IMSTR
-    char format_0[64];  // format may not end with \0
-    const char* format = format_0;
-    IM_ASSERT(format_p.End - format_p.Begin < IM_ARRAYSIZE(format_0));
-
-    // Default format string when passing NULL
+    const char* format;
+    char format_buf[64];
     if (!format_p)
+    {
+        // Default format string when passing NULL
         format = DataTypeGetInfo(data_type)->PrintFmt;
+    }
+    else
+    {
+        // Copy format string (format may not be zero-terminated)
+        format = format_buf;
+        IM_ASSERT(format_p.End - format_p.Begin < IM_ARRAYSIZE(format_buf));
+        ImStrncpy(format_buf, format_p, IM_ARRAYSIZE(format_buf));
+    }
 
     const bool hovered = ItemHoverable(frame_bb, id, g.LastItemData.ItemFlags);
     const bool clicked = hovered && IsMouseClicked(0, ImGuiInputFlags_None, id);
@@ -3675,13 +3695,20 @@ bool ImGui::InputScalar(ImStrv label, ImGuiDataType data_type, void* p_data, con
     IM_ASSERT((flags & ImGuiInputTextFlags_EnterReturnsTrue) == 0); // Not supported by InputScalar(). Please open an issue if you this would be useful to you. Otherwise use IsItemDeactivatedAfterEdit()!
 
     // FIXME-IMSTR
-    char format_0[64];  // format may not end with \0
-    const char* format = format_0;
-    IM_ASSERT(format_p.End - format_p.Begin < IM_ARRAYSIZE(format_0));
-    ImStrncpy(format_0, format_p, IM_ARRAYSIZE(format_0));
-
+    const char* format;
+    char format_buf[64];
     if (!format_p)
+    {
+        // Default format string when passing NULL
         format = DataTypeGetInfo(data_type)->PrintFmt;
+    }
+    else
+    {
+        // Copy format string (format may not be zero-terminated)
+        format = format_buf;
+        IM_ASSERT(format_p.End - format_p.Begin < IM_ARRAYSIZE(format_buf));
+        ImStrncpy(format_buf, format_p, IM_ARRAYSIZE(format_buf));
+    }
 
     void* p_data_default = (g.NextItemData.HasFlags & ImGuiNextItemDataFlags_HasRefVal) ? &g.NextItemData.RefVal : &g.DataTypeZeroValue;