diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-03-26 22:25:08 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-05-08 22:56:28 -0700 |
| commit | 773e4890b385a229b0919b4a249714d0bb7171a2 (patch) | |
| tree | fe5296a5c16da4c22387fff32c063e04b95a20b5 | |
| parent | 21f58a2b0d0d96492d2d7c7de1bd654ed0114279 (diff) | |
Don't leak canonical module name and patterns if module is built-in
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 1c101d75d4855b2698e3fc8d2dd662f20585812f)
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/loader/loadmod.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index e98f013c4..22b540c5d 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -867,7 +867,8 @@ doLoadModule(const char *module, const char *path, const char **subdirlist, if (!strcmp (m, *cim)) { xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m); - return (ModuleDescPtr) 1; + ret = (ModuleDescPtr) 1; + goto LoadModule_exit; } if (!name) { |