diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 14ecb0dd0..ecd57ffbb 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -64,6 +64,9 @@ Other Changes:
     between hard minimum window size and table minimum size).
   - Fixed an issue where submitting non-integer row heights would eventually
     advance table parent layout by +0/+1 depending on its visibility.
+- Text:
+  - Fixed low-level word-wrapping function reading from *text_end when passed
+    a string range. (#9107) [@achabense]
 - Scrollbar: fixed a codepath leading to a divide-by-zero (which would not be
   noticeable by user but detected by sanitizers). (#9089) [@judicaelclair]
 - Debug Tools:
diff --git a/imgui_draw.cpp b/imgui_draw.cpp
index bee1503de..1b83fea92 100644
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@@ -5364,7 +5364,7 @@ const char* ImTextCalcWordWrapNextLineStart(const char* text, const char* text_e
     if ((flags & ImDrawTextFlags_WrapKeepBlanks) == 0)
         while (text < text_end && ImCharIsBlankA(*text))
             text++;
-    if (*text == '\n')
+    if (text < text_end && *text == '\n')
         text++;
     return text;
 }