make ui_draw_text a bit safer when cache_get_text returns NULL
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@285 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
19c34cdbc6
commit
17e9c6b607
6
xwin.c
6
xwin.c
@ -1279,6 +1279,9 @@ ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, int y,
|
|||||||
else
|
else
|
||||||
x += text[i + 2];
|
x += text[i + 2];
|
||||||
}
|
}
|
||||||
|
for (j = 0; j < entry->size; j++)
|
||||||
|
DO_GLYPH(((uint8 *) (entry->data)), j);
|
||||||
|
}
|
||||||
if (i + 2 < length)
|
if (i + 2 < length)
|
||||||
i += 3;
|
i += 3;
|
||||||
else
|
else
|
||||||
@ -1287,9 +1290,6 @@ ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, int y,
|
|||||||
/* this will move pointer from start to first character after FE command */
|
/* this will move pointer from start to first character after FE command */
|
||||||
text = &(text[i]);
|
text = &(text[i]);
|
||||||
i = 0;
|
i = 0;
|
||||||
for (j = 0; j < entry->size; j++)
|
|
||||||
DO_GLYPH(((uint8 *) (entry->data)), j);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
Loading…
Reference in New Issue
Block a user