procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/xfont.c (xfont_draw): Allocate the XChar2b array (Bug#35814)

Browse source
This commit is contained in:
Alexander Gramiak 2019-05-21 14:58:59 -06:00
parent 9624f60949
commit 5a024b72c5
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/xfont.c
View file

@ -1047,11 +1047,16 @@ xfont_draw (struct glyph_string *s, int from, int to, int x, int y,
}
else
{
const unsigned code = s->char2b[from];
const XChar2b char2b = { .byte1 = code >> 8,
.byte2 = code & 0xFF };
USE_SAFE_ALLOCA;
const unsigned *code = s->char2b + from;
XChar2b *char2b;
SAFE_NALLOCA (char2b, 1, len);
for (int i = 0; i < len; ++i)
char2b[i] = (XChar2b) { .byte1 = code[i] >> 8,
.byte2 = code[i] & 0xFF };
XDrawImageString16 (display, FRAME_X_DRAWABLE (s->f),
gc, x, y, &char2b, len);
gc, x, y, char2b, len);
SAFE_FREE ();
}
}
else
@ -1067,11 +1072,16 @@ xfont_draw (struct glyph_string *s, int from, int to, int x, int y,
}
else
{
const unsigned code = s->char2b[from];
const XChar2b char2b = { .byte1 = code >> 8,
.byte2 = code & 0xFF };
USE_SAFE_ALLOCA;
const unsigned *code = s->char2b + from;
XChar2b *char2b;
SAFE_NALLOCA (char2b, 1, len);
for (int i = 0; i < len; ++i)
char2b[i] = (XChar2b) { .byte1 = code[i] >> 8,
.byte2 = code[i] & 0xFF };
XDrawString16 (display, FRAME_X_DRAWABLE (s->f),
gc, x, y, &char2b, len);
gc, x, y, char2b, len);
SAFE_FREE ();
}
}
unblock_input ();