From 785e530e836e98a58c51fd8cc19ba6871cd89769 Mon Sep 17 00:00:00 2001
From: László Németh <laszlo.nemeth@collabora.com>
Date: Sat, 21 May 2016 02:26:48 +0200
Subject: fix bad index/assertion failure with line ending autocorrect patterns

Test case: type "->" and press Enter in a new en-US text document.
Result: crash or missing replacement of the arrow.

Change-Id: I052ae868b6fe0b1e5557c40471d31a20bd1e5ca9
---
 editeng/source/misc/svxacorr.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index de4254289544..5545432fd11c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2834,8 +2834,11 @@ const SvxAutocorrWord* SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p
                 SvxAutocorrWord* pNew = new SvxAutocorrWord(aShort, aLong);
                 if ( Insert( pNew ) )
                 {
-                    if ( IsWordDelim(rTxt[nEndPos]) ) return pNew;
-                } else delete pNew;
+                    if ( (rTxt.getLength() > nEndPos && IsWordDelim(rTxt[nEndPos])) || rTxt.getLength() == nEndPos )
+                        return pNew;
+                }
+                else
+                    delete pNew;
             }
         }
     }
-- 
cgit