Make a little safer when there is text that is invalid in the encoding.

1 files changed, 4 insertions, 0 deletions

diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 88edfdec5..ac90dee2a 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -1088,6 +1088,10 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION
 						}
 						clusterStart = clusterEnd;
 					}
+					while (i < lenPositions) {
+						// If something failed, fill in rest of the positions
+						positions[i++] = clusterStart;
+					}
 					PLATFORM_ASSERT(i == lenPositions);
 				}
 			}