summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Everton <dan@iocaine.org>2006-03-11 16:16:15 +0000
committerDan Everton <dan@iocaine.org>2006-03-11 16:16:15 +0000
commit5f40aac300fe8a0cb6cfb10664886f1d22902234 (patch)
tree634c2b98048248acaa32c93bd7b5179474507f46
parenta1635c2b17694b644b8aeef74688147fc1899626 (diff)
downloadrockbox-5f40aac300fe8a0cb6cfb10664886f1d22902234.tar.gz
rockbox-5f40aac300fe8a0cb6cfb10664886f1d22902234.zip
Don't pass NULL to dlclose. Stops the simulator crashing if there's a problem loading a plugin or codec.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9003 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--uisimulator/common/io.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index 906e3d0514..ccc174ba3d 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -179,3 +179,4 @@ Rui Marinho
179Alun Thomas 179Alun Thomas
180Nils Wallménius 180Nils Wallménius
181Naoaki Okazaki 181Naoaki Okazaki
182Will Dyson
diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c
index 56cdb46a6b..9115ef29e1 100644
--- a/uisimulator/common/io.c
+++ b/uisimulator/common/io.c
@@ -361,7 +361,6 @@ void *sim_codec_load_ram(char* codecptr, int size,
361#else 361#else
362 DEBUGF("dlopen(%s): %s\n", path, dlerror()); 362 DEBUGF("dlopen(%s): %s\n", path, dlerror());
363#endif 363#endif
364 dlclose(*pd);
365 return NULL; 364 return NULL;
366 } 365 }
367 366
@@ -399,7 +398,6 @@ void *sim_plugin_load(char *plugin, void **pd)
399#else 398#else
400 DEBUGF("dlopen(%s): %s\n", path, dlerror()); 399 DEBUGF("dlopen(%s): %s\n", path, dlerror());
401#endif 400#endif
402 dlclose(*pd);
403 return NULL; 401 return NULL;
404 } 402 }
405 403