From 69dc32cfac945bf664ddfbd6f0116404f893e66e Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Sun, 14 Aug 2005 12:16:51 +0000 Subject: Add a check which compares the passed in size of the DDX driver private DRI structure to the 3D drivers view of it, and abort if they don't match. This traps the case with the drmAddress removal in the DDX driver. --- src/mesa/drivers/dri/i915/intel_screen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 6c3f2f5774..61166fe2a6 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -79,6 +79,10 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv) (PFNGLXSCRENABLEEXTENSIONPROC) (*dri_interface->getProcAddress("glxEnableExtension")); void * const psc = sPriv->psc->screenConfigs; + if (sPriv->devPrivSize != sizeof(I830DRIRec)) { + fprintf(stderr,"\nERROR! sizeof(I830DRIRec) does not match passed size from 2D driver\n"); + return GL_FALSE; + } /* Allocate the private area */ intelScreen = (intelScreenPrivate *)CALLOC(sizeof(intelScreenPrivate)); -- cgit v1.2.3