stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7018364: XShmGetImage with image's > drawable's size causes BadMatch

Browse Source 
Reviewed-by: art, anthony
This commit is contained in:
Clemens Eisserer 2011-02-11 10:40:24 -08:00 committed by Phil Race
parent 4598218eac
commit 8a19e99f74
2 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
View File

@ -595,11 +595,12 @@ XImage* X11SD_CreateSharedImage(X11SDOps *xsdo,
} }
XImage* X11SD_GetSharedImage(X11SDOps *xsdo, jint width, jint height, XImage* X11SD_GetSharedImage(X11SDOps *xsdo, jint width, jint height,
jboolean readBits) jint maxWidth, jint maxHeight, jboolean readBits)
{ {
XImage * retImage = NULL; XImage * retImage = NULL;
if (cachedXImage != NULL && if (cachedXImage != NULL &&
X11SD_CachedXImageFits(width, height, xsdo->depth, readBits)) { X11SD_CachedXImageFits(width, height, maxWidth, maxHeight,
xsdo->depth, readBits)) {
/* sync so previous data gets flushed */ /* sync so previous data gets flushed */
XSync(awt_display, False); XSync(awt_display, False);
retImage = cachedXImage; retImage = cachedXImage;
@ -728,8 +729,8 @@ void X11SD_UnPuntPixmap(X11SDOps *xsdo)
* it must be close enough to avoid excessive reading from the screen; * it must be close enough to avoid excessive reading from the screen;
* otherwise it should just be at least the size requested. * otherwise it should just be at least the size requested.
*/ */
jboolean X11SD_CachedXImageFits(jint width, jint height, jint depth, jboolean X11SD_CachedXImageFits(jint width, jint height, jint maxWidth,
jboolean readBits) jint maxHeight, jint depth, jboolean readBits)
{ {
/* we assume here that the cached image exists */ /* we assume here that the cached image exists */
jint imgWidth = cachedXImage->width; jint imgWidth = cachedXImage->width;
@ -747,10 +748,14 @@ jboolean X11SD_CachedXImageFits(jint width, jint height, jint depth,
return JNI_TRUE; return JNI_TRUE;
} }
if ((imgWidth < width + 64) && (imgHeight < height + 64)) { if ((imgWidth < width + 64) && (imgHeight < height + 64)
&& imgWidth <= maxWidth && imgHeight <= maxHeight)
{
/* Cached image's width/height shouldn't be more than 64 pixels /* Cached image's width/height shouldn't be more than 64 pixels
* larger than requested, because the region in XShmGetImage * larger than requested, because the region in XShmGetImage
* can't be specified and we don't want to read too much. * can't be specified and we don't want to read too much.
* Furthermore it has to be smaller than maxWidth/Height
* so drawables are not read out of bounds.
*/ */
return JNI_TRUE; return JNI_TRUE;
} }
@ -1295,7 +1300,7 @@ static XImage * X11SD_GetImage(JNIEnv *env, X11SDOps *xsdo,
SurfaceDataBounds *bounds, SurfaceDataBounds *bounds,
jint lockFlags) jint lockFlags)
{ {
int x, y, w, h; int x, y, w, h, maxWidth, maxHeight;
int scan; int scan;
XImage * img = NULL; XImage * img = NULL;
Drawable drawable; Drawable drawable;
@ -1311,10 +1316,31 @@ static XImage * X11SD_GetImage(JNIEnv *env, X11SDOps *xsdo,
#ifdef MITSHM #ifdef MITSHM
if (useMitShmExt == CAN_USE_MITSHM) { if (useMitShmExt == CAN_USE_MITSHM) {
if (xsdo->isPixmap && readBits) { if (xsdo->isPixmap) {
if (readBits) {
X11SD_PuntPixmap(xsdo, w, h); X11SD_PuntPixmap(xsdo, w, h);
} }
img = X11SD_GetSharedImage(xsdo, w, h, readBits); maxWidth = xsdo->pmWidth;
maxHeight = xsdo->pmHeight;
} else {
XWindowAttributes winAttr;
if (XGetWindowAttributes(awt_display,
(Window) xsdo->drawable, &winAttr) != 0) {
maxWidth = winAttr.width;
maxHeight = winAttr.height;
} else {
/* XGWA failed which isn't a good thing. Defaulting to using
* x,y means that after the subtraction of these we will use
* w=0, h=0 which is a reasonable default on such a failure.
*/
maxWidth = x;
maxHeight = y;
}
}
maxWidth -= x;
maxHeight -= y;
img = X11SD_GetSharedImage(xsdo, w, h, maxWidth, maxHeight, readBits);
} }
#endif /* MITSHM */ #endif /* MITSHM */
drawable = xsdo->drawable; drawable = xsdo->drawable;

10
jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
View File

@ -125,15 +125,21 @@ struct _X11SDOps {
#define X11SD_LOCK_BY_SHMEM 4 /* surface locked by ShMemExt */ #define X11SD_LOCK_BY_SHMEM 4 /* surface locked by ShMemExt */
#ifdef MITSHM #ifdef MITSHM
XImage * X11SD_GetSharedImage (X11SDOps *xsdo, jint width, jint height, jboolean readBits); XImage * X11SD_GetSharedImage (X11SDOps *xsdo,
jint width, jint height,
jint maxWidth, jint maxHeight,
jboolean readBits);
XImage * X11SD_CreateSharedImage (X11SDOps *xsdo, jint width, jint height); XImage * X11SD_CreateSharedImage (X11SDOps *xsdo, jint width, jint height);
Drawable X11SD_CreateSharedPixmap (X11SDOps *xsdo); Drawable X11SD_CreateSharedPixmap (X11SDOps *xsdo);
void X11SD_DropSharedSegment (XShmSegmentInfo *shminfo); void X11SD_DropSharedSegment (XShmSegmentInfo *shminfo);
void X11SD_PuntPixmap (X11SDOps *xsdo, jint width, jint height); void X11SD_PuntPixmap (X11SDOps *xsdo, jint width, jint height);
void X11SD_UnPuntPixmap (X11SDOps *xsdo); void X11SD_UnPuntPixmap (X11SDOps *xsdo);
jboolean X11SD_CachedXImageFits (jint width, jint height, jint depth, jboolean readBits); jboolean X11SD_CachedXImageFits (jint width, jint height,
jint maxWidth, jint maxHeight,
jint depth, jboolean readBits);
XImage * X11SD_GetCachedXImage (jint width, jint height, jboolean readBits); XImage * X11SD_GetCachedXImage (jint width, jint height, jboolean readBits);
#endif /* MITSHM */ #endif /* MITSHM */
jint X11SD_InitWindow(JNIEnv *env, X11SDOps *xsdo);
void X11SD_DisposeOrCacheXImage (XImage * image); void X11SD_DisposeOrCacheXImage (XImage * image);
void X11SD_DisposeXImage(XImage * image); void X11SD_DisposeXImage(XImage * image);
void X11SD_DirectRenderNotify(JNIEnv *env, X11SDOps *xsdo); void X11SD_DirectRenderNotify(JNIEnv *env, X11SDOps *xsdo);