diff options
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/glxdri.c | 10 | ||||
| -rw-r--r-- | xorg-server/glx/glxdri2.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c index a997e2f8a..1ac683978 100644 --- a/xorg-server/glx/glxdri.c +++ b/xorg-server/glx/glxdri.c @@ -645,8 +645,10 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen, for (i = 0; i < pScreen->numVisuals; i++, visual++) if (visual->vid == glxConfig->visualID) break; - if (i == pScreen->numVisuals) + if (i == pScreen->numVisuals) { + free(context); return NULL; + } context->hwContextID = FakeClientID(0); @@ -655,8 +657,10 @@ __glXDRIscreenCreateContext(__GLXscreen * baseScreen, context->hwContextID, &hwContext); __glXleaveServer(GL_FALSE); - if (!retval) + if (!retval) { + free(context); return NULL; + } context->driContext = screen->legacy->createNewContext(screen->driScreen, config->driConfig, 0, /* render type */ driShare, @@ -885,7 +889,7 @@ glxDRILeaveVT(ScrnInfoPtr scrn) __GLXDRIscreen *screen = (__GLXDRIscreen *) glxGetScreen(xf86ScrnToScreen(scrn)); - LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n"); + LogMessageVerbSigSafe(X_INFO, -1, "AIGLX: Suspending AIGLX clients for VT switch\n"); glxSuspendClients(); diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c index e07cb5632..8a1fa4159 100644 --- a/xorg-server/glx/glxdri2.c +++ b/xorg-server/glx/glxdri2.c @@ -835,7 +835,7 @@ glxDRILeaveVT(ScrnInfoPtr scrn) __GLXDRIscreen *screen = (__GLXDRIscreen *) glxGetScreen(xf86ScrnToScreen(scrn)); - LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n"); + LogMessageVerbSigSafe(X_INFO, -1, "AIGLX: Suspending AIGLX clients for VT switch\n"); glxSuspendClients(); @@ -946,7 +946,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) &screen->fd, &driverName, &deviceName)) { LogMessage(X_INFO, "AIGLX: Screen %d is not DRI2 capable\n", pScreen->myNum); - return NULL; + goto handle_error; } screen->base.destroy = __glXDRIscreenDestroy; |