summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-11-02 14:02:18 +0000
committerMichael Stahl <mstahl@redhat.com>2017-11-03 10:44:26 +0100
commita6dc83081d95deddb9906d8b577a21fcf41d25f3 (patch)
tree8d95c5b4ffc0689e3e08e93e66414c0bf566a2e8 /svtools
parent72ca169691c4572f913a44a90bbe51a90b59fc7e (diff)
Infinite loop in ooo32227-1.rtf with calc rtf filter
Change-Id: I068b205c844296379b5641356e4087b17f0a3535 Reviewed-on: https://gerrit.libreoffice.org/44235 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/svrtf/parrtf.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 17921cdaf718..9d3a03087d1c 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -336,7 +336,9 @@ void SvRTFParser::ScanText()
sal_Char nSlash = '\\';
while (!bBreak)
{
- wchar_t next=GetNextChar();
+ auto next = GetNextChar();
+ if (sal_Unicode(EOF) == next)
+ break;
if (next>0xFF) // fix for #i43933# and #i35653#
{
if (!aByteString.isEmpty())