summaryrefslogtreecommitdiffstats
path: root/src/world.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-12-01 01:17:25 +0000
committerDavid Robillard <d@drobilla.net>2011-12-01 01:17:25 +0000
commitc0c37097cf3ae4f7b7e4067f9ffcd9826808782c (patch)
tree1c0555495b13d45d5f8842fc8cc0a9b8867625ae /src/world.c
parentff2c63e5b454026b61918c9a34dc4f8857f75edd (diff)
downloadlilv-c0c37097cf3ae4f7b7e4067f9ffcd9826808782c.tar.gz
lilv-c0c37097cf3ae4f7b7e4067f9ffcd9826808782c.tar.bz2
lilv-c0c37097cf3ae4f7b7e4067f9ffcd9826808782c.zip
Fix crash in wordexp when LV2_PATH is corrupt (patch from Paul Davis).
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3714 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/world.c')
-rw-r--r--src/world.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/world.c b/src/world.c
index 0bad4c4..e291c55 100644
--- a/src/world.c
+++ b/src/world.c
@@ -561,7 +561,10 @@ expand(const char* path)
#ifdef HAVE_WORDEXP
char* ret = NULL;
wordexp_t p;
- wordexp(path, &p, 0);
+ if (wordexp(path, &p, 0)) {
+ LILV_ERRORF("Error expanding path `%s'\n", path);
+ return lilv_strdup (path);
+ }
if (p.we_wordc == 0) {
/* Literal directory path (e.g. no variables or ~) */
ret = lilv_strdup(path);