Module: Mesa Branch: master Commit: 27141f984d6401dc466f0e9b0c5da2a9248045e3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=27141f984d6401dc466f0e9b0c5da2a9248045e3
Author: Boyan Ding <[email protected]> Date: Sat Aug 8 17:23:28 2015 +0800 egl/x11: Fix driver_name acquisition 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. Fixes: 45e110bad9d (egl/x11: trust our loader over the xserver for the drivername) Reported-by: Timothy Arceri <[email protected]> Signed-off-by: Boyan Ding <[email protected]> [Emil Velikov: use brackets for both branches of conditional] Reviewed-by: Emil Velikov <[email protected]> --- src/egl/drivers/dri2/platform_x11.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 61e5b77..9b040f7 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -602,14 +602,13 @@ dri2_x11_connect(struct dri2_egl_display *dri2_dpy) */ loader_driver_name = loader_get_driver_for_fd(dri2_dpy->fd, 0); if (loader_driver_name) { - free(driver_name); - driver_name = 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)); } - dri2_dpy->driver_name = - strndup(driver_name, - xcb_dri2_connect_driver_name_length(connect)); - if (dri2_dpy->device_name == NULL || dri2_dpy->driver_name == NULL) { close(dri2_dpy->fd); free(dri2_dpy->device_name); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
