From 684a210dd44ba5bb239eb07842ced767059a3fb8 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 20 Aug 2015 20:55:25 +0100
Subject: clip text to skip to max text available

Change-Id: I5c5c033954d5b6f869a05f19f312f9330df74efb
---
 sw/source/filter/ww8/ww8par.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sw/source/filter/ww8/ww8par.cxx')

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 21791a99457f..0d0fb1e54b86 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3783,8 +3783,9 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, long nTextEnd, bool& rbStar
                     (aRes.nSprmId == eFLD) || (aRes.nSprmId == eAND)
                    )
                 {
+                    WW8_CP nMaxLegalSkip = nTextEnd - rTextPos;
                     // Skip Field/Footnote-/End-Note here
-                    rTextPos += nSkipChars;
+                    rTextPos += std::min<WW8_CP>(nSkipChars, nMaxLegalSkip);
                     nSkipPos = rTextPos-1;
                 }
             }
-- 
cgit v1.2.3