summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2011-11-11 23:54:34 +0100
committerMiklos Vajna <vmiklos@frugalware.org>2011-11-12 00:03:55 +0100
commit444d04b60b17efb481cd34949e133119f6764845 (patch)
tree681eb444c4c2d06c35c88b764fcca9ddd2ee090e
parent5a212d501ee1c8ae2b7b9517a4ff486e61cac0fd (diff)
Related: fdo#37498 don't try to read after the last closing brace
-rw-r--r--writerfilter/source/rtftok/rtftokenizer.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 49d5ee07c9cf..7dedd40f1003 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -84,9 +84,10 @@ int RTFTokenizer::resolveParse()
ret = m_rImport.popState();
if (ret)
return ret;
- if (m_rImport.isSubstream() && m_rImport.getGroup() == 0)
+ if (m_rImport.getGroup() == 0)
{
- m_rImport.finishSubstream();
+ if (m_rImport.isSubstream())
+ m_rImport.finishSubstream();
return 0;
}
break;