diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-08-24 21:51:28 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-08-24 21:51:28 +0000 |
| commit | 8fd250e5e4c2016614b82e2d653b7fbf8a3a5b99 (patch) | |
| tree | c733535af905d46eda32032c75b5b3cd424498c1 /exa | |
| parent | 79dc5f3d5fe5a66f5fa53af9afc30d27d1af0bce (diff) | |
Bugzilla #4089: Fix crashes in !EXA_OFFSCREEN_PIXMAPS case by not trying to
do migration when the EXA pixmap private is NULL.
Diffstat (limited to 'exa')
| -rw-r--r-- | exa/exa.c | 7 | ||||
| -rw-r--r-- | exa/exa_accel.c | 7 | ||||
| -rw-r--r-- | exa/exa_migration.c | 7 |
3 files changed, 21 insertions, 0 deletions
@@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap) ExaPixmapPriv (pPixmap); STRACE; + + if (pExaPixmap == NULL) + return; + if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) return; @@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap) { ExaPixmapPriv (pPixmap); + if (pExaPixmap == NULL) + return; + if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) return; diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 5ba8af356..4d25d5a92 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap) ExaPixmapPriv (pPixmap); STRACE; + + if (pExaPixmap == NULL) + return; + if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) return; @@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap) { ExaPixmapPriv (pPixmap); + if (pExaPixmap == NULL) + return; + if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) return; diff --git a/exa/exa_migration.c b/exa/exa_migration.c index 5ba8af356..4d25d5a92 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap) ExaPixmapPriv (pPixmap); STRACE; + + if (pExaPixmap == NULL) + return; + if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) return; @@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap) { ExaPixmapPriv (pPixmap); + if (pExaPixmap == NULL) + return; + if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) return; |