X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=4e70dc0b82091b5b207a45e49d8f3c43d648796d;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=d0f9b3d83ef404b7b78703441f6d7887eef13fb8;hpb=d79225ae987164c59d92621f5f7de203d3179c4c;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index d0f9b3d83e..4e70dc0b82 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -771,7 +771,7 @@ public:
 	FontIterator & operator++()
 	{
 		++pos_;
-		if (pos_ > endspan_ || pos_ == bodypos_) {
+		if (pos_ < par_.size() && (pos_ > endspan_ || pos_ == bodypos_)) {
 			font_ = tm_.displayFont(pit_, pos_);
 			endspan_ = par_.fontSpan(pos_).last;
 		}