| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-03-27 05:25:08 (GMT) |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-04-01 22:56:55 (GMT) |
| commit | 1c101d75d4855b2698e3fc8d2dd662f20585812f (patch) (side-by-side diff) | |
| tree | 448bc19a4738b965735cabb0c70d5b14856e3304 | |
| parent | 9180081ec32b6c655d193de4c89b59d222a72579 (diff) | |
| download | xserver-1c101d75d4855b2698e3fc8d2dd662f20585812f.zip xserver-1c101d75d4855b2698e3fc8d2dd662f20585812f.tar.gz | |
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>
| -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 dbf6c2e..fccb3b1 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -868,7 +868,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) { |