jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hand-apply patches (X11rdp text) from Authentic8: d25c23d f977cd9

Browse Source
This commit is contained in:
Jim Grandy 2013-07-06 08:50:12 -07:00
parent 2f395bdfa0
commit a5348298fd
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
xorg/X11R7.6/rdp/rdpdraw.c
View File

@ -780,7 +780,8 @@ draw_item_pack(PixmapPtr pix, rdpPixmapRec *priv)
} }
else else
{ {
if (region_in_region(di->reg, -1, di_prev->reg)) if ((di->type == RDI_TEXT) &&
region_interect_at_all(di->reg, di_prev->reg))
{ {
break; break;
} }
@ -1718,6 +1719,32 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
} }
} }
/******************************************************************************/
/* make sure no glyph is too big */
/* returns boolean */
static int
rdpGlyphCheck(int nlist, GlyphListPtr list, GlyphPtr* glyphs)
{
int n;
GlyphPtr glyph;
while (nlist--)
{
n = list->len;
list++;
while (n--)
{
glyph = *glyphs++;
if ((glyph->info.width * glyph->info.height) > 8192)
{
LLOGLN(10, ("rdpGlyphCheck: too big"));
return 0;
}
}
}
return 1;
}
/******************************************************************************/ /******************************************************************************/
void void
rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
@ -1729,7 +1756,7 @@ rdpGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
LLOGLN(10, ("rdpGlyphs: op %d xSrc %d ySrc %d maskFormat %p", op, xSrc, ySrc, maskFormat)); LLOGLN(10, ("rdpGlyphs: op %d xSrc %d ySrc %d maskFormat %p", op, xSrc, ySrc, maskFormat));
if (g_do_glyph_cache) if (g_do_glyph_cache && rdpGlyphCheck(nlists, lists, glyphs))
{ {
g_doing_font = 2; g_doing_font = 2;
ps = GetPictureScreen(g_pScreen); ps = GetPictureScreen(g_pScreen);