|
 |
f085be |
From e7bd0484228beb4529e84742faf56f813dca495a Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Michael Stahl <mstahl@redhat.com>
|
|
|
f085be |
Date: Fri, 18 Jul 2014 22:07:02 +0200
|
|
|
f085be |
Subject: [PATCH 035/137] (related: fdo#78502) writerfilter: RTF import: fix
|
|
|
f085be |
invalid string copy
|
|
|
f085be |
MIME-Version: 1.0
|
|
|
f085be |
Content-Type: text/plain; charset=UTF-8
|
|
|
f085be |
Content-Transfer-Encoding: 8bit
|
|
|
f085be |
|
|
|
f085be |
... in leveltext destination.
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I74de6d14170130bf33923854a0c9851dc7cc390f
|
|
|
f085be |
(cherry picked from commit b94bd40b915ab32d18d43fc60dfda932e4e00ca8)
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10397
|
|
|
f085be |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f085be |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f085be |
---
|
|
|
f085be |
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +-
|
|
|
f085be |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
f085be |
index 66abe80..73eb3f2 100644
|
|
|
f085be |
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
f085be |
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
|
|
|
f085be |
@@ -4278,7 +4278,7 @@ int RTFDocumentImpl::popState()
|
|
|
f085be |
// The first character is the length of the string (the rest should be ignored).
|
|
|
f085be |
sal_Int32 nLength(aStr.toChar());
|
|
|
f085be |
OUString aValue;
|
|
|
f085be |
- if (nLength <= aStr.getLength())
|
|
|
f085be |
+ if (nLength < aStr.getLength())
|
|
|
f085be |
aValue = aStr.copy(1, nLength);
|
|
|
f085be |
else
|
|
|
f085be |
aValue = aStr;
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|