Mesa (master): glx: Fix two identical null check errors in driSet/ GetInterval
Brian Paul
brianp at kemper.freedesktop.org
Thu Dec 19 15:26:37 UTC 2013
Module: Mesa
Branch: master
Commit: cd6aaf2920ae69d743e5efe62bc26fa5ae678732
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd6aaf2920ae69d743e5efe62bc26fa5ae678732
Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date: Thu Dec 19 05:27:00 2013 -0700
glx: Fix two identical null check errors in driSet/GetInterval
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/glx/dri_glx.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c
index 0b89e3e..2e00bf0 100644
--- a/src/glx/dri_glx.c
+++ b/src/glx/dri_glx.c
@@ -747,13 +747,15 @@ static int
driSetSwapInterval(__GLXDRIdrawable *pdraw, int interval)
{
struct dri_drawable *pdp = (struct dri_drawable *) pdraw;
- struct dri_screen *psc = (struct dri_screen *) pdraw->psc;
- if (psc->swapControl != NULL && pdraw != NULL) {
- psc->swapControl->setSwapInterval(pdp->driDrawable, interval);
- return 0;
- }
+ if (pdraw != NULL) {
+ struct dri_screen *psc = (struct dri_screen *) pdraw->psc;
+ if (psc->swapControl != NULL) {
+ psc->swapControl->setSwapInterval(pdp->driDrawable, interval);
+ return 0;
+ }
+ }
return GLX_BAD_CONTEXT;
}
@@ -761,11 +763,13 @@ static int
driGetSwapInterval(__GLXDRIdrawable *pdraw)
{
struct dri_drawable *pdp = (struct dri_drawable *) pdraw;
- struct dri_screen *psc = (struct dri_screen *) pdraw->psc;
- if (psc->swapControl != NULL && pdraw != NULL)
- return psc->swapControl->getSwapInterval(pdp->driDrawable);
+ if (pdraw != NULL) {
+ struct dri_screen *psc = (struct dri_screen *) pdraw->psc;
+ if (psc->swapControl != NULL)
+ return psc->swapControl->getSwapInterval(pdp->driDrawable);
+ }
return 0;
}
More information about the mesa-commit
mailing list