sal/osl/unx/uunxapi.cxx | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit df500ead2914c76983db8d40e2bad21c903b7ee9
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Dec 19 15:16:41 2013 +0200
Fix crash on Android
Fallout from 0e6a2601b39cbadaff7f7506ba9e804f108060db ("Convert code that
calls OUString::getStr()[] to use the [] operator"). The code was a bit
silly
and "hand-optimized" in the first place so no wonder a bug was introduced
accidentally in that commit.
Make it simpler and more obvious.
Change-Id: Idafb1c0741289e915dfbaa108383a926321764d2
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index a9f3c5f..8d495f2 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -128,9 +128,7 @@ int access_u(const rtl_uString* pustrPath, int mode)
{
rtl::OString fn = OUStringToOString(pustrPath);
#ifdef ANDROID
- if (fn.startsWith("/assets") &&
- (fn[sizeof("/assets")-1] == '\0' ||
- fn[sizeof("/assets")-1] == '/'))
+ if (fn == "/assets" || fn.startsWith("/assets/"))
{
struct stat stat;
if (lo_apk_lstat(fn.getStr(), &stat) == -1)
@@ -161,9 +159,7 @@ sal_Bool realpath_u(const rtl_uString* pustrFileName,
rtl_uString** ppustrResolv
{
rtl::OString fn = OUStringToOString(pustrFileName);
#ifdef ANDROID
- if (fn.startsWith("/assets") &&
- (fn[sizeof("/assets")-1] == '\0' ||
- fn[sizeof("/assets")-1] == '/'))
+ if (fn == "/assets" || fn.startsWith("/assets/"))
{
if (access_u(pustrFileName, F_OK) == -1)
return sal_False;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
