frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #7366: Fix two crashes in operations on source pictures. 

A screen's ChangePictureTransform now isn't called when changing the transform,
as source pictures aren't associated with screens.  Also, attempting to set
an AlphaMap to a source picture will fail with BadMatch just like a Window
would, preventing another crash.
This commit is contained in:
Eric Anholt 2006-06-30 03:01:14 +02:00
parent 50a3e1ad18
commit 6ef4579139
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
render/picture.c
View File

@ -1217,7 +1217,8 @@ ChangePicture (PicturePtr pPicture,
error = BadPixmap; error = BadPixmap;
break; break;
} }
if (pAlpha->pDrawable->type != DRAWABLE_PIXMAP) if (pAlpha->pDrawable == NULL ||
pAlpha->pDrawable->type != DRAWABLE_PIXMAP)
{ {
client->errorValue = pid; client->errorValue = pid;
error = BadMatch; error = BadMatch;
@ -1469,9 +1470,6 @@ SetPictureTransform (PicturePtr pPicture,
{ 0x00000, xFixed1, 0x00000 }, { 0x00000, xFixed1, 0x00000 },
{ 0x00000, 0x00000, xFixed1 }, { 0x00000, 0x00000, xFixed1 },
} }; } };
ScreenPtr pScreen = pPicture->pDrawable->pScreen;
PictureScreenPtr ps = GetPictureScreen(pScreen);
int result;
if (transform && memcmp (transform, &identity, sizeof (PictTransform)) == 0) if (transform && memcmp (transform, &identity, sizeof (PictTransform)) == 0)
transform = 0; transform = 0;
@ -1496,9 +1494,16 @@ SetPictureTransform (PicturePtr pPicture,
} }
pPicture->serialNumber |= GC_CHANGE_SERIAL_BIT; pPicture->serialNumber |= GC_CHANGE_SERIAL_BIT;
result = (*ps->ChangePictureTransform) (pPicture, transform); if (pPicture->pDrawable != NULL) {
int result;
PictureScreenPtr ps = GetPictureScreen(pPicture->pDrawable->pScreen);
return result; result = (*ps->ChangePictureTransform) (pPicture, transform);
return result;
}
return Success;
} }
void void

5
render/picturestr.h
View File

@ -349,7 +349,12 @@ typedef struct _PictureScreen {
PictFilterAliasPtr filterAliases; PictFilterAliasPtr filterAliases;
int nfilterAliases; int nfilterAliases;
/**
* Called immediately after a picture's transform is changed through the
* SetPictureTransform request. Not called for source-only pictures.
*/
ChangePictureTransformProcPtr ChangePictureTransform; ChangePictureTransformProcPtr ChangePictureTransform;
ChangePictureFilterProcPtr ChangePictureFilter; ChangePictureFilterProcPtr ChangePictureFilter;
DestroyPictureFilterProcPtr DestroyPictureFilter; DestroyPictureFilterProcPtr DestroyPictureFilter;