]> code.delx.au - gnu-emacs/commit
Attempt to fix crashes due to accesses beyond glyph matrix end
authorEli Zaretskii <eliz@gnu.org>
Sun, 31 May 2015 14:41:35 +0000 (17:41 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sun, 31 May 2015 14:41:35 +0000 (17:41 +0300)
commitcab645a62f3e5963ee7da94eb9c33961601c6651
treebb09b6cf6ca9b103524201bcb7fc5947951613d9
parent643470ff797407b256eea380e0f41d3749400927
Attempt to fix crashes due to accesses beyond glyph matrix end

* src/xdisp.c (x_produce_glyphs): When it->ascent and it->descent
are determined from per-character metrics, don't let the
max_ascent and max_descent become smaller than values returned by
normal_char_ascent_descent, to avoid unpleasant dynamic resizing
of screen line heights when text changes.

* src/xterm.c (x_new_font)
* src/w32term.c (x_new_font): Call get_font_ascent_descent to
obtain a reasonable value for FRAME_LINE_HEIGHT, even when a font
claims very large value for its height.

* src/font.c (font_open_entity): Call get_font_ascent_descent to
obtain a reasonable value for FRAME_SMALLEST_FONT_HEIGHT, even
when a font claims very large value for its height.
src/font.c
src/w32term.c
src/xdisp.c
src/xterm.c