Commit 7f6ad209 authored by Adrian Robert's avatar Adrian Robert

* nsterm.m (ns_lookup_indexed_color): Check for bad index. (ns_index_color):...

* nsterm.m (ns_lookup_indexed_color): Check for bad index.  (ns_index_color): Init unused slot to 0.  (ns_dumpglyphs_box_or_relief): Replace useless xassert with an if(). Bug 3714, possibly 3082.
parent 5dd9a6f7
2009-07-23 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsterm.m (EmacsView-keyUp:): Only act when running under Tiger.
Bugs 3792, 3720, 2402.
(ns_lookup_indexed_color): Check for bad index.
(ns_index_color): Init unused slot to 0.
(ns_dumpglyphs_box_or_relief): Replace useless xassert with an if().
Bug 3714, possibly 3082.
2009-07-22 Jason Rumney <jasonr@gnu.org>
......
......@@ -1249,6 +1249,8 @@ Free a pool and temporary objects it refers to (callable from C)
ns_lookup_indexed_color (unsigned long idx, struct frame *f)
{
struct ns_color_table *color_table = FRAME_NS_DISPLAY_INFO (f)->color_table;
if (idx < 1 || idx >= color_table->avail)
return nil;
return color_table->colors[idx];
}
......@@ -1266,6 +1268,7 @@ Free a pool and temporary objects it refers to (callable from C)
color_table->avail = 1; /* skip idx=0 as marker */
color_table->colors
= (NSColor **)xmalloc (color_table->size * sizeof (NSColor *));
color_table->colors[0] = nil;
color_table->empty_indices = [[NSMutableSet alloc] init];
}
......@@ -2650,9 +2653,8 @@ Function modeled after x_draw_glyph_string_box ().
r = ns_fix_rect_ibw (r, FRAME_INTERNAL_BORDER_WIDTH (s->f),
FRAME_PIXEL_WIDTH (s->f));
if (s->face->box == FACE_SIMPLE_BOX)
/* TODO: Sometimes box_color is 0 and this seems wrong; should investigate. */ if (s->face->box == FACE_SIMPLE_BOX && s->face->box_color)
{
xassert (s->face->box_color != nil);
ns_draw_box (r, abs (thickness),
ns_lookup_indexed_color (face->box_color, s->f),
left_p, right_p);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment