svtools/source/svrtf/parrtf.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit bcaa452f20b46749afd8fd48addadd4718484be1
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Nov 2 14:02:18 2017 +0000
Infinite loop in ooo32227-1.rtf with calc rtf filter
Change-Id: I068b205c844296379b5641356e4087b17f0a3535
Reviewed-on: https://gerrit.libreoffice.org/44218
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 309e5fb96c8a..7db60878a9e4 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())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
