diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-05-21 14:58:59 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-05-21 15:11:23 -0600 |
| commit | 5a024b72c50129cc429bc4b8b18b8c08f3f6b430 (patch) | |
| tree | c3e78e17665135b514f2ad32c6166c488600102e | |
| parent | 9624f609493da7c08016ba00d6895bad0fe26a0e (diff) | |
| download | emacs-5a024b72c50129cc429bc4b8b18b8c08f3f6b430.tar.gz | |
* src/xfont.c (xfont_draw): Allocate the XChar2b array (Bug#35814)
| -rw-r--r-- | src/xfont.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/xfont.c b/src/xfont.c index a402f770630..81808e7a62e 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -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 (); |