summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-09-21 14:18:02 +0300
committerTor Lillqvist <tml@iki.fi>2012-09-21 14:18:13 +0300
commit963c98a65e4eddf179e170ff0bb30e4bfafc6b16 (patch)
tree5835a74aec467023e39686337ce9a70546e54efc /sal
parent7b7c28f9bd39551211e44b601eccf93e82e1ff8a (diff)
Guard against lack of slashes in dli_fname
Change-Id: Id9c452d9c1034f2e7969a9eae7588f2eb81a8813
Diffstat (limited to 'sal')
-rw-r--r--sal/android/lo-bootstrap.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 07f6a277e07a..f1498695395f 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1603,7 +1603,10 @@ Java_org_libreoffice_android_Bootstrap_setCommandArgs(JNIEnv* env,
if (slash != NULL)
*slash = '\0';
slash = strrchr(new_argv0, '/');
- strcpy(slash+1, c_argv[0]);
+ if (slash != NULL)
+ strcpy(slash+1, c_argv[0]);
+ else
+ strcpy(new_argv0, c_argv[0]);
free(c_argv[0]);
c_argv[0] = new_argv0;
}