diff options
| author | Paulo Zanoni <[email protected]> | 2011-01-13 04:59:12 -0800 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-01-13 07:44:33 -0700 |
| commit | dad914f6b2e5862a5174133f11276e975867be04 (patch) | |
| tree | acf0de602b9b8e2ae50b06c165d4d4ed6c02daa0 /src/mesa/drivers/dri/common/dri_util.c | |
| parent | 9277a62aa3c1b2073dcfafcf34265b4d7154f4da (diff) | |
dri_util: fail driCreateNewScreen if InitScreen is NULL
Without this, X doesn't start with UMS on r300g.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
Signed-off-by: Paulo Zanoni <[email protected]>
Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/common/dri_util.c')
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index a5b71bd40ad..bf8cf6eec07 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -790,6 +790,9 @@ driCreateNewScreen(int scrn, static const __DRIextension *emptyExtensionList[] = { NULL }; __DRIscreen *psp; + if (driDriverAPI.InitScreen == NULL) + return NULL; + psp = calloc(1, sizeof *psp); if (!psp) return NULL; |