fix an infinite loop when upskip a left punctuation

koreader · Jan 8, 2014 · c4c2436 · c4c2436
1 parent ab221ce
commit c4c2436
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/kpvcrlib/lvtextfm-punctuation.patch b/kpvcrlib/lvtextfm-punctuation.patch
@@ -59,7 +59,7 @@ index 57bbf3b..e6f5913 100755
 +    }
 +
 +    bool isCJKLeftPunctuation(lChar16 c) {
-+       return c==L'“' || c==L'‘' /*|| c==L'「' || c==L'『' */|| c==L'《' || c==L'〈' || c==L'（' || c==L'【';
++       return c==L'“' || c==L'‘' || c==L'「' || c==L'『' || c==L'《' || c==L'〈' || c==L'（' || c==L'【';
 +    }
 +
      /// Split paragraph into lines
@@ -99,7 +99,7 @@ index 57bbf3b..e6f5913 100755
 +            int upSkipCount = 0;
 +            if (endp > 1 && isCJKLeftPunctuation(*(m_text + endp))) {
 +				CRLog::trace("skip skip punctuation %s, at index %d", LCSTR(lString16(m_text+endp, 1)), endp);
-+            } else if (endp > 1 && isCJKLeftPunctuation(*(m_text + endp - 1))) {
++            } else if (endp > 1 && endp < m_length && isCJKLeftPunctuation(*(m_text + endp - 1))) {
 +               endp--; wrapPos--;
 +               CRLog::trace("up skip left punctuation %s, at index %d", LCSTR(lString16(m_text+endp, 1)), endp);
 +            } else if (endp > 1 && isCJKPunctuation(*(m_text + endp))) {