diff options
author | Owain Ainsworth <zerooa@googlemail.com> | 2009-07-16 20:38:43 +0100 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-07-17 11:28:29 -0700 |
commit | 57c7cbade9556e7b21867e61353f0928fd553616 (patch) | |
tree | d8b20ad7933ce4b08ad23d6c47e6a3e1ebb6ac1e | |
parent | bb3007384298cb57625ec0b3868dff9b23568f3e (diff) |
accessing a pixmap if prepare_access fails is verboten.
Don't do it, treat this the same as every other prepare access call in uxa.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Owain Ainsworth <zerooa@googlemail.com>
-rw-r--r-- | uxa/uxa.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -244,9 +244,10 @@ uxa_validate_gc (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) /* We can't inline stipple handling like we do for GCTile because it sets * fbgc privates. */ - uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW); - fbValidateGC (pGC, changes, pDrawable); - uxa_finish_access(&pGC->stipple->drawable); + if (uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW)) { + fbValidateGC (pGC, changes, pDrawable); + uxa_finish_access(&pGC->stipple->drawable); + } } else { fbValidateGC (pGC, changes, pDrawable); } |