InputText: Fixed a crash on deactivating a ReadOnly buffer. (#6570, #6292, #4714)
This will be part of 1.89.7 Tagged relase.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 832df13..6589554 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -92,6 +92,7 @@
- CollapsingHeader/TreeNode: Fixed text padding when using _Framed+_Leaf flags. (#6549) [@BobbyAnguelov]
- InputText: Fixed not returning true when buffer is cleared while using the
ImGuiInputTextFlags_EscapeClearsAll flag. (#5688, #2620)
+- InputText: Fixed a crash on deactivating a ReadOnly buffer. (#6570, #6292, #4714)
- InputText: ImGuiInputTextCallbackData::InsertChars() accept (NULL,NULL) range, in order to conform
to common idioms (e.g. passing .data(), .data() + .size() from a null string). (#6565, #6566, #3615)
- Combo: Made simple/legacy Combo() function not returns true when picking already selected item.
diff --git a/imgui.h b/imgui.h
index 8ef5108..03e503e 100644
--- a/imgui.h
+++ b/imgui.h
@@ -25,7 +25,7 @@
// Library Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
#define IMGUI_VERSION "1.89.7"
-#define IMGUI_VERSION_NUM 18970
+#define IMGUI_VERSION_NUM 18971
#define IMGUI_HAS_TABLE
/*
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index e16dddb..4313244 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -4052,8 +4052,16 @@
if (id == 0 || state->ID != id)
return;
g.InputTextDeactivatedState.ID = state->ID;
- g.InputTextDeactivatedState.TextA.resize(state->CurLenA + 1);
- memcpy(g.InputTextDeactivatedState.TextA.Data, state->TextA.Data ? state->TextA.Data : "", state->CurLenA + 1);
+ if (state->Flags & ImGuiInputTextFlags_ReadOnly)
+ {
+ g.InputTextDeactivatedState.TextA.resize(0); // In theory this data won't be used, but clear to be neat.
+ }
+ else
+ {
+ IM_ASSERT(state->TextA.Data != 0);
+ g.InputTextDeactivatedState.TextA.resize(state->CurLenA + 1);
+ memcpy(g.InputTextDeactivatedState.TextA.Data, state->TextA.Data, state->CurLenA + 1);
+ }
}
// Edit a string of text
