summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2009-02-15 00:17:45 -0500
committerChris Ball <cjb@laptop.org>2009-02-15 00:17:45 -0500
commite33dc807bf4504ba242cb19ce8024cdb32e10f4d (patch)
tree600a14d18e24ba8809f1cd57526969ec83fff114
parent7c278551c79d7a5898c627341f58fad59b7ae20d (diff)
Fix pMsk=NULL segfault at startup on OLPC
Commit 7c278551c79d7a5898c627341f58fad59b7ae20d uses pMsk without testing for non-NULL, and this causes an immediate segfault when running Sugar. Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--src/lx_exa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lx_exa.c b/src/lx_exa.c
index f6eeb65..31f9b0e 100644
--- a/src/lx_exa.c
+++ b/src/lx_exa.c
@@ -565,7 +565,7 @@ lx_check_composite(int op, PicturePtr pSrc, PicturePtr pMsk, PicturePtr pDst)
}
/* We don't support any mask transforms */
- if (pMsk->transform)
+ if (pMsk && pMsk->transform)
return FALSE;
/* Keep an eye out for source rotation transforms - those we can