d8d132
--- src/libnrtype/Layout-TNG-OutIter.cpp~       2018-03-11 16:38:09.000000000 -0400
d8d132
+++ src/libnrtype/Layout-TNG-OutIter.cpp        2018-06-16 13:17:03.129605681 -0400
d8d132
@@ -182,6 +182,8 @@
d8d132
     if (_input_stream[source_index]->Type() != TEXT_SOURCE)
d8d132
         return iterator(this, char_index);
d8d132
d8d132
+    if (char_index >= _characters.size())
d8d132
+        return end();
d8d132
     return iterator(this, char_index);
d8d132
     /* This code was never used, the text_iterator argument was "NULL" in all calling code
d8d132
     InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]);
d8d132