From 22d5d7a5980f2c2e652345ee7db85cfcd4a24d2f Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Thu, 3 Jul 2025 12:31:41 +0100
Subject: [PATCH] SimpleShapedText: Fix potential heap buffer overflow

---
 modules/juce_graphics/detail/juce_SimpleShapedText.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/juce_graphics/detail/juce_SimpleShapedText.cpp b/modules/juce_graphics/detail/juce_SimpleShapedText.cpp
index c70bd43ba0..dd24382b3c 100644
--- a/modules/juce_graphics/detail/juce_SimpleShapedText.cpp
+++ b/modules/juce_graphics/detail/juce_SimpleShapedText.cpp
@@ -615,10 +615,10 @@ static RangedValues<Font> resolveFontsWithFallback (Span<const juce_wchar> strin
 
     for (const auto [r, f] : fonts)
     {
-        const auto constrained = r.constrainRange ({ 0, (int64) string.size() });
+        const auto intersected = r.getIntersectionWith ({ 0, (int64) string.size() });
         auto rf = findSuitableFontsForText (f,
-                                            { string.data() + constrained.getStart(),
-                                              (size_t) constrained.getLength() });
+                                            { string.data() + intersected.getStart(),
+                                              (size_t) intersected.getLength() });
 
         for (const auto [subRange, font] : rf)
         {