writerfilter/source/rtftok/rtftokenizer.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 047396e4e792b041b20757091263499709fc4e8a Author: Caolán McNamara <[email protected]> Date: Tue Sep 6 20:19:04 2016 +0100 rtf: don't skip backwards on skipping bin specified bytes otherwise we could end up re-parsing the block endlessly Change-Id: Ia90a9e5b513951c91e1917483f9e030dbee98ffb Reviewed-on: https://gerrit.libreoffice.org/28709 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 2dab789..ba411d2 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -282,7 +282,7 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nPara { // skip binary data explicitely, to not trip over rtf markup // control characters - if (rKeyword.equals("bin")) + if (rKeyword.equals("bin") && nParam > 0) Strm().SeekRel(nParam); return RTFError::OK; }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
