Index: src/af/gr/unix/gr_UnixPangoGraphics.cpp
===================================================================
--- src/af/gr/unix/gr_UnixPangoGraphics.cpp	(revision 21883)
+++ src/af/gr/unix/gr_UnixPangoGraphics.cpp	(working copy)
@@ -1800,11 +1800,13 @@
 			iExtraSpace -= iSpace;
 			iPoints--;
 
-			RI.m_pJustify[i] = ltpu(iSpace);
-
-			// TODO here we need to add this amount the pango metrics
-			RI.m_pGlyphs->glyphs[i].geometry.width += RI.m_pJustify[i];
-			
+			if(i < RI.m_pGlyphs->num_glyphs)
+			{
+				RI.m_pJustify[i] = ltpu(iSpace);
+				
+				// TODO here we need to add this amount the pango metrics
+				RI.m_pGlyphs->glyphs[i].geometry.width += RI.m_pJustify[i];
+			}
 			if(!iPoints)
 				break;
 		}