On 8 August 2015 at 10:23, Boyan Ding <boyan.j.d...@gmail.com> wrote:
> We don't need to free driverName string from dri2 reply, on the other
> hand, the driver name acquired from loader doesn't need duplication.
>
> This fixes commit 45e110ba
>
> Cc: Emil Velikov <emil.l.veli...@gmail.com>
> Reported-by: Timothy Arceri <t_arc...@yahoo.com.au>
> Signed-off-by: Boyan Ding <boyan.j.d...@gmail.com>
> ---
> src/egl/drivers/dri2/platform_x11.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/src/egl/drivers/dri2/platform_x11.c
> b/src/egl/drivers/dri2/platform_x11.c
> index 61e5b77..ee5b53f 100644
> --- a/src/egl/drivers/dri2/platform_x11.c
> +++ b/src/egl/drivers/dri2/platform_x11.c
> @@ -601,15 +601,14 @@ dri2_x11_connect(struct dri2_egl_display *dri2_dpy)
> * Otherwise, default to the server's value.
> */
> loader_driver_name = loader_get_driver_for_fd(dri2_dpy->fd, 0);
> - if (loader_driver_name) {
> - free(driver_name);
> - driver_name = loader_driver_name;
> + if (loader_driver_name)
> + dri2_dpy->driver_name = loader_driver_name;
> + else {
> + dri2_dpy->driver_name =
> + strndup(driver_name,
> + xcb_dri2_connect_driver_name_length(connect));
> }
I've added a pair of brackets, to keep the if symmetrical to the else,
and pushed this to master.
Thanks for fixing my thinko Boyan.
-Emil
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
