Mercurial > emacs
changeset 104047:f3ac65e9abd6
* 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.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 23 Jul 2009 13:21:44 +0000 |
| parents | 95a3747ab8d5 |
| children | 712697e0dfcc |
| files | src/ChangeLog src/nsterm.m |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 23 11:52:45 2009 +0000 +++ b/src/ChangeLog Thu Jul 23 13:21:44 2009 +0000 @@ -1,6 +1,11 @@ 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>
--- a/src/nsterm.m Thu Jul 23 11:52:45 2009 +0000 +++ b/src/nsterm.m Thu Jul 23 13:21:44 2009 +0000 @@ -1249,6 +1249,8 @@ 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 @@ 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 @@ 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);