diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-06-21 22:33:17 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-23 09:06:00 +0000 |
| commit | 69987ea99a722cb4b3e2df3132b89bacd0a5b862 (patch) | |
| tree | 8cdda40ac130d13dffbbb022de85c4289f67f96d | |
| parent | 7a5727ba35ca2cff191208625448994202a94df6 (diff) | |
Related fdo#58774 Alternative dialog Find & Replace for Writer
After having installed the extension from http://extensions.libreoffice.org/extension-center/alternative-dialog-find-replace-for-writer/releases/1.4
I had a crash, extract of bt:
5 0x00002aaad3ee13df in rtl::OUString::copy (this=0x7fffffff2510, beginIndex=147, count=-15) at /home/julien/compile-libreoffice/libreoffice/include/rtl/ustring.hxx:1481
6 0x00002aaad3edc10e in stringresource::StringResourcePersistenceImpl::implScanLocaleNames (this=0x8e2bba0, aContentSeq=uno::Sequence of length 24 = {...})
at /home/julien/compile-libreoffice/libreoffice/scripting/source/stringresource/stringresource.cxx:1728
So add a quick check to be sure iDot > iSlash
Cherry-picked from d59da701c67074a44abcfebcb7506792d12127ae
Change-Id: I944a852d6cc9a35c451985ac96032f0d848136e8
Reviewed-on: https://gerrit.libreoffice.org/9848
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index ce814efaff3f..f245f0231a5a 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -1727,7 +1727,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< OUStrin OUString aExtension; sal_Int32 iDot = aCompleteName.lastIndexOf( '.' ); sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' ); - if( iDot != -1 ) + if( iDot != -1 && iDot > iSlash) { sal_Int32 iCopyFrom = (iSlash != -1) ? iSlash + 1 : 0; aPureName = aCompleteName.copy( iCopyFrom, iDot-iCopyFrom ); |