svtools/source/svrtf/parrtf.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 05cc10da5fe10e712dd6252bbd039856059263af
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Aug 16 12:29:12 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Aug 16 16:25:35 2018 +0200
ofz#9691 infinite-loop
Change-Id: Ifab7271c20104e0e073f68d8a570bceb9d8f387a
Reviewed-on: https://gerrit.libreoffice.org/59168
Tested-by: Jenkins
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 bff4bcacc54e..7360c77ede37 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -174,8 +174,13 @@ int SvRTFParser::GetNextToken_()
if (!_inSkipGroup) {
// UPR - overread the group with the ansi
// information
- while( '{' != GetNextToken_() )
- ;
+ int nNextToken;
+ do
+ {
+ nNextToken = GetNextToken_();
+ }
+ while (nNextToken != '{' && nNextToken !=
sal_Unicode(EOF));
+
SkipGroup();
GetNextToken_(); // overread the last bracket
nRet = 0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
