Mesa (master): radeong: Always return something for create_screen.

Corbin Simpson csimpson at kemper.freedesktop.org
Mon Feb 8 21:39:00 UTC 2010


Module: Mesa
Branch: master
Commit: 184cefcd8c3169743955cb0b6af79a1793cda685
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=184cefcd8c3169743955cb0b6af79a1793cda685

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Mon Feb  8 13:37:55 2010 -0800

radeong: Always return something for create_screen.

Prevents a segfault on e.g. r600.

---

 src/gallium/winsys/drm/radeon/core/radeon_drm.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.c b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
index 257bdca..5881aba 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_drm.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
@@ -132,6 +132,9 @@ struct pipe_screen* radeon_create_screen(struct drm_api* api,
     if (is_r3xx(rwinsys->pci_id)) {
         radeon_setup_winsys(drmFB, rwinsys);
         return r300_create_screen(rwinsys);
+    } else {
+        FREE(rwinsys);
+        return NULL;
     }
 }
 




More information about the mesa-commit mailing list