aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-30 19:48:07 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-30 19:48:07 +0000
commita516e72d60803cac3b81b3330db55983b080d8da (patch)
tree96e532b3f7e04a2c4143f61baf9beff52a8f2154
parent8f7aeaf6b38fc0d4c8c3eb9292ae250579437724 (diff)
linux-user: don't crash with null name
From Thayne Harbaugh. path() may be called with null string, don't bother trying to remap in that case. Signed-off-by: Riku Voipio <riku.voipio@iki.fi> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6480 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--linux-user/path.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/path.c b/linux-user/path.c
index 27c7d50518..06b1f5fb6f 100644
--- a/linux-user/path.c
+++ b/linux-user/path.c
@@ -152,7 +152,7 @@ const char *path(const char *name)
{
/* Only do absolute paths: quick and dirty, but should mostly be OK.
Could do relative by tracking cwd. */
- if (!base || name[0] != '/')
+ if (!base || !name || name[0] != '/')
return name;
return follow_path(base, name) ?: name;