[PATCH] Don't leak canonical module name and patterns if module is built-in

[Peter Hutterer]

On Tue, Mar 31, 2009 at 11:23:25AM -0700, Alan Coopersmith wrote:
> Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
> ---
>  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) {
> -- 
> 1.5.6.5

Acked-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
  Peter