Bugzilla #4089: Fix crashes in !EXA_OFFSCREEN_PIXMAPS case by not trying to
do migration when the EXA pixmap private is NULL.
This commit is contained in:
parent
79dc5f3d5f
commit
8fd250e5e4
@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap)
|
|||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
STRACE;
|
STRACE;
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap)
|
|||||||
{
|
{
|
||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap)
|
|||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
STRACE;
|
STRACE;
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap)
|
|||||||
{
|
{
|
||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap)
|
|||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
STRACE;
|
STRACE;
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap)
|
|||||||
{
|
{
|
||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap)
|
|||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
STRACE;
|
STRACE;
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap)
|
|||||||
{
|
{
|
||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap)
|
|||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
STRACE;
|
STRACE;
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap)
|
|||||||
{
|
{
|
||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -264,6 +264,10 @@ exaPixmapUseScreen (PixmapPtr pPixmap)
|
|||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
STRACE;
|
STRACE;
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -287,6 +291,9 @@ exaPixmapUseMemory (PixmapPtr pPixmap)
|
|||||||
{
|
{
|
||||||
ExaPixmapPriv (pPixmap);
|
ExaPixmapPriv (pPixmap);
|
||||||
|
|
||||||
|
if (pExaPixmap == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user