+2011-07-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ * process.c (Fnetwork_interface_list): Check for overflow
+ in size calculation.
+
+ * nsterm.h (struct ns_color_table.size, struct ns_color_table.avail):
+ Now ptrdiff_t, not int.
+ * nsterm.m (ns_index_color): Use ptrdiff_t, not int, for table indexes.
+ (ns_draw_fringe_bitmap): Rewrite to avoid overflow.
+
+ * minibuf.c (read_minibuf_noninteractive): Don't leak memory
+ on memory overflow.
+
+ * macros.c: Integer and memory overflow fixes.
+ (Fstart_kbd_macro): Don't update size until alloc done.
+ (store_kbd_macro_char): Reorder multiplicands to avoid overflow.
+
+ * lread.c (read1, init_obarray): Don't update size until alloc done.
+
+ * keymap.c: Integer overflow fixes.
+ (cmm_size, current_minor_maps): Use ptrdiff_t, not int, to count maps.
+ (current_minor_maps): Check for size calculation overflow.
+ * keymap.h: Change prototypes to match the above.
+
+ * keyboard.c: Integer and memory overflow fixes.
+ (read_char, menu_bar_items, tool_bar_items, read_char_x_menu_prompt)
+ (read_char_minibuf_menu_width, read_char_minibuf_menu_prompt)
+ (follow_key, read_key_sequence): Use ptrdiff_t, not int, to count maps.
+ (read_char_minibuf_menu_prompt): Check for overflow in size
+ calculations. Don't update size until allocation succeeds. Redo
+ calculations to avoid overflow.
+ * keyboard.h: Change prototypes to match the above.
+
+ * image.c: Integer and memory overflow fixes.
+ (RANGED_INTEGERP, TYPE_RANGED_INTEGERP): Remove; these are duplicate
+ now that they've been promoted to lisp.h.
+ (x_allocate_bitmap_record, x_alloc_image_color)
+ (make_image_cache, cache_image, xpm_load):
+ Don't update size until alloc is done.
+ (xpm_load, lookup_rgb_color, lookup_pixel_color, x_to_xcolors)
+ (x_detect_edges):
+ Check for size calculation overflow.
+ (ct_colors_allocated_max): New constant.
+ (x_to_xcolors, x_detect_edges): Reorder multiplicands to avoid
+ overflow.
+
2011-07-28 Paul Eggert <eggert@cs.ucla.edu>
+ * gtkutil.c: Integer overflow fixes.
+ (get_utf8_string, xg_store_widget_in_map):
+ Check for size-calculation overflow.
+ (get_utf8_string): Use ptrdiff_t, not size_t, where either will
+ do, as we prefer signed integers.
+ (id_to_widget.max_size, id_to_widget.used)
+ (xg_store_widget_in_map, xg_remove_widget_from_map)
+ (xg_get_widget_from_map, xg_get_scroll_id_for_window)
+ (xg_remove_scroll_bar, xg_update_scrollbar_pos):
+ Use and return ptrdiff_t, not int.
+ (xg_gtk_scroll_destroy): Don't assume ptrdiff_t fits in int.
+ * gtkutil.h: Change prototypes to match the above.
+
+ * ftfont.c: Check for size overflow.
+ (ftfont_get_open_type_spec, setup_otf_gstring, ftfont_shape_by_flt):
+ Check for integer overflow in size calculations.
+
+ * fringe.c (Fdefine_fringe_bitmap): Don't update size until alloc works.
+
+ * frame.h (struct frame): Use int, not EMACS_INT, where int works.
+ This is for the members text_lines, text_cols, total_lines, total_cols,
+ where the system imposes an 'int' limit.
+
+ * frame.c: Integer overflow fixes.
+ (set_menu_bar_lines, x_set_frame_parameters, x_set_scroll_bar_width)
+ (x_figure_window_size): Check for integer overflow.
+ (x_set_alpha): Do not assume XINT fits in int.
+
+ * eval.c: Integer and memory overflow fixes.
+ (init_eval_once, grow_specpdl): Don't update size until alloc succeeds.
+ (call_debugger, grow_specpdl): Redo calculations to avoid overflow.
+
+ * emacs.c (main, sort_args): Check for size-calculation overflow.
+
+ * editfns.c: Integer and memory overflow fixes.
+ (set_time_zone_rule): Don't assume environment length fits in int.
+ (message_length): Now ptrdiff_t, not int.
+ (Fmessage_box): Don't update size until allocation succeeds.
+ Don't assume message length fits in int.
+ (Fformat): Use ptrdiff_t, not EMACS_INT, where ptrdiff_t will do.
+
+ * doc.c: Integer and memory overflow fixes.
+ (get_doc_string_buffer_size): Now ptrdiff_t, not int.
+ (get_doc_string): Check for size calculation overflow.
+ Don't update size until allocation succeeds.
+ (get_doc_string, Fsubstitute_command_keys): Use ptrdiff_t, not
+ EMACS_INT, where ptrdiff_t will do.
+ (Fsubstitute_command_keys): Check for string overflow.
+
+ Integer and memory overflow fixes for display code.
+ * dispextern.h (struct glyph_pool.nglyphs): Now ptrdiff_t, not int.
+ * dispnew.c (adjust_glyph_matrix, realloc_glyph_pool, scrolling_window):
+ Check for overflow in size calculations.
+ (line_draw_cost, realloc_glyph_pool, add_row_entry):
+ Don't assume glyph table len fits in int.
+ (struct row_entry.bucket, row_entry_pool_size, row_entry_idx)
+ (row_table_size): Now ptrdiff_t, not int.
+ (scrolling_window): Avoid overflow in size calculations.
+ Don't update size until allocation succeeds.
+ * fns.c (concat): Check for overflow in size calculations.
+ (next_almost_prime): Verify NEXT_ALMOST_PRIME_LIMIT.
+ * lisp.h (RANGED_INTEGERP, TYPE_RANGED_INTEGERP): New macros.
+ (NEXT_ALMOST_PRIME_LIMIT): New constant.
+
+ * composite.c: Integer overflow fixes.
+ (get_composition_id): Check for overflow in glyph length calculations.
+
+ * coding.c: Integer and memory overflow fixes.
+ (produce_chars): Redo buffer-overflow calculations to avoid
+ unnecessary integer overflow. Check for size overflow.
+ (encode_coding_object): Don't update size until xmalloc succeeds.
+
+ * character.c (Fstring): Check for size-calculation overflow.
+
+ * ccl.c: Integer and memory overflow fixes.
+ (Fccl_execute_on_string): Check for memory overflow.
+ Use ptrdiff_t rather than EMACS_INT where ptrdiff_t will do.
+ Redo buffer-overflow calculations to avoid integer overflow.
+
* callproc.c (child_setup): Don't assume strlen fits in int.
* buffer.c: Memory overflow fixes.
HCoop / bpt / emacs.git / blobdiff