summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-04-05 18:09:41 +0200
committerMichael Stahl <mstahl@redhat.com>2012-04-05 18:13:33 +0200
commitdc2fe18e95731dcb7c9e2027f45fdaf265490592 (patch)
tree7d0da403fa1399a520d2ffc7824f0ecd23d32c7b /sfx2
parentd564c79e6d0780882845a28d8ab32f9eb3dee03b (diff)
fdo#43895 lp#905355: fix the fix so it doesn't crash
rtl::OUString rtl::OUString::copy(sal_Int32) const: Assertion `beginIndex >= 0 && beginIndex <= getLength()' failed. (regression from dd2fe95cce75f1157bd1c75d286a0047b2e4175e)
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx11
1 files changed, 10 insertions, 1 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 0018912180fa..37a2f29ed1e3 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1641,8 +1641,17 @@ void FileDialogHelper_Impl::getRealFilter( String& _rFilter ) const
void FileDialogHelper_Impl::verifyPath()
{
#ifdef UNX
+ static char const s_FileScheme[] = "file://";
+ if (0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
+ maPath.getStr(), maPath.getLength(),
+ s_FileScheme, RTL_CONSTASCII_LENGTH(s_FileScheme)))
+ {
+ return;
+ }
+ const OString sFullPath = OUStringToOString(
+ maPath.copy(RTL_CONSTASCII_LENGTH(s_FileScheme)) + maFileName,
+ osl_getThreadTextEncoding() );
struct stat aFileStat;
- const OString sFullPath = OUStringToOString( maPath.copy(RTL_CONSTASCII_LENGTH("file://")) + maFileName, osl_getThreadTextEncoding() );
stat( sFullPath.getStr(), &aFileStat );
// lp#905355, fdo#43895
// Check that the file has read only permission and is in /tmp -- this is