[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashe
|
From: |
Paul Eggert |
|
Subject: |
bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs) |
|
Date: |
Thu, 28 Jul 2011 23:44:57 -0700 |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.18) Gecko/20110617 Thunderbird/3.1.11 |
Package: emacs
Version: 24.0.50
Tags: patch
This is a followup to Bug#9079. The enclosed patch fixes several more
integer and memory overflow issues in the Emacs trunk, mostly having
to do with 64-bit machines. Like Bug#9079, the patch doesn't add any
features to Emacs and it focuses on fixing bugs, so it should be
suitable for installing into the trunk after a bit more testing.
Here's an example bug fixed by the patch. Start Emacs on a 64-bit
GNU/Linux host, and cut-and-paste a slightly-larger-than-2-GiB chunk
of text from some other application into Emacs. Emacs will dump core
due to heap corruption.
This patch is large and tedious but mostly straightforward. For those
inclined to wade through it, I suggest looking at two issues.
* The patch to image.c uses vsnprintf in order to avoid a buffer
overflow with sprintf. The code can't use doprnt because the API
is established by the TIFF library, and the TIFF library code uses
a printf-like interface, not a doprnt-like interface. The patch
assumes only the intersection of the standard/GNU and the Microsoft
behaviors for vsnprintf, so it should be portable.
* The patch to xselect.c required the most work on my part, is the
trickiest, and would be most helped by a review, if someone has the
time for that.
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: eggert@cs.ucla.edu-20110729053112-essfu02l7ms3r8wy
# target_branch: bzr+ssh://eggert@bzr.savannah.gnu.org/emacs/trunk
# testament_sha1: 3f815ffa0cb03479afac0558dfab16532da52b40
# timestamp: 2011-07-28 22:46:36 -0700
# base_revision_id: schwab@linux-m68k.org-20110728202319-\
# yx12un58runa3zxk
#
# Begin patch
=== modified file 'src/ChangeLog'
--- src/ChangeLog 2011-07-28 20:23:19 +0000
+++ src/ChangeLog 2011-07-29 05:31:12 +0000
@@ -1,3 +1,358 @@
+2011-07-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ Integer and memory overflow issues.
+
+ * bidi.c (bidi_shelve_header_size): New constant.
+ (bidi_cache_ensure_space, bidi_shelve_cache): Use it.
+ (bidi_cache_ensure_space): Avoid integer overflow when allocating.
+
+ * buffer.c (overlays_at, overlays_in, record_overlay_string)
+ (overlay_strings):
+ Don't update size of array until after memory allocation succeeds,
+ because xmalloc/xrealloc may not return.
+
+ * callproc.c (child_setup): Don't assume strlen fits in int.
+
+ * ccl.c (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.
+
+ * character.c (Fstring): Check for size-calculation overflow.
+
+ * coding.c (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.
+
+ * composite.c (get_composition_id): Check for overflow in glyph
+ length calculations.
+
+ 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.
+
+ * doc.c (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.
+
+ * editfns.c (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.
+
+ * emacs.c (main, sort_args): Check for size-calculation overflow.
+
+ * eval.c (init_eval_once, grow_specpdl): Don't update size until
+ alloc succeeds.
+ (call_debugger, grow_specpdl): Redo calculations to avoid overflow.
+
+ * frame.c (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.
+
+ * 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.
+
+ * fringe.c (Fdefine_fringe_bitmap):
+ Don't update size until alloc works.
+
+ * ftfont.c (ftfont_get_open_type_spec, setup_otf_gstring)
+ (ftfont_shape_by_flt): Check for integer overflow in size calculations.
+
+ * gtkutil.c (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.
+
+ * image.c (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.
+
+ * keyboard.c (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.
+
+ * keymap.c (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.
+
+ * lread.c (read1, init_obarray): Don't update size until alloc done.
+
+ * macros.c (Fstart_kbd_macro): Don't update size until alloc done.
+ (store_kbd_macro_char): Reorder multiplicands to avoid overflow.
+
+ * minibuf.c (read_minibuf_noninteractive): Don't leak memory
+ on memory overflow.
+
+ * 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.
+
+ * process.c (Fnetwork_interface_list): Check for overflow
+ in size calculation.
+
+ * region-cache.c (move_cache_gap): Check for size calculation overflow.
+
+ * scroll.c (do_line_insertion_deletion_costs): Check for size calc
+ overflow. Don't bother calling xmalloc when xrealloc will do.
+
+ * search.c (Freplace_match): Check for size calculation overflow.
+ (Fset_match_data): Don't assume list lengths fit in 'int'.
+
+ * sysdep.c (system_process_attributes): Use ptrdiff_t, not int,
+ for command line length. Do not attempt to address one before the
+ beginning of an array, as that's not portable.
+
+ * term.c (max_frame_lines): Remove; unused.
+ (encode_terminal_src_size, encode_terminal_dst_size): Now ptrdiff_t,
+ not int.
+ (encode_terminal_code, calculate_costs): Check for size
+ calculation overflow.
+ (encode_terminal_code): Use ptrdiff_t, not int, to record glyph
+ table lengths and related sizes. Don't update size until alloc
+ done. Redo calculations to avoid overflow.
+ (calculate_costs): Don't bother calling xmalloc when xrealloc will do.
+
+ * termcap.c (tgetent): Use ptrdiff_t, not int, to record results of
+ subtracting pointers.
+ (gobble_line): Check for overflow more carefully. Don't update size
+ until alloc done.
+
+ * tparam.c (tparam1): Use ptrdiff_t, not int, for sizes.
+ Don't update size until alloc done.
+ Redo size calculations to avoid overflow.
+ Check for size calculation overflow.
+
+ * xdisp.c (store_mode_line_noprop_char, x_consider_frame_title):
+ Use ptrdiff_t, not int, for sizes.
+ (store_mode_line_noprop_char): Don't update size until alloc done.
+
+ * xfaces.c (Finternal_make_lisp_face): Use ptrdiff_t, not int, for
+ sizes. Check for size calculation overflow.
+ (cache_face): Do not overflow in size calculation.
+
+ * xfns.c (x_encode_text, x_set_name_internal)
+ (Fx_change_window_property): Use ptrdiff_t, not int, to count
+ sizes, since they can exceed INT_MAX in size. Check for size
+ calculation overflow.
+
+ * xgselect.c (xg_select): Check for size calculation overflow.
+ Don't update size until alloc done.
+
+ * xrdb.c (magic_file_p): Plug memory leak on size overflow.
+ (get_environ_db): Don't assume path length fits in int,
+ as sprintf is limited to int lengths.
+
+ * xselect.c (X_LONG_SIZE, X_USHRT_MAX, X_ULONG_MAX): New macros.
+ Use them to make the following changes clearer.
+ (MAX_SELECTION_QUANTUM): Make the other bounds on this value clearer.
+ This change doesn't affect the value now, but it may help remind
+ future maintainers not to raise the value too much later.
+ (SELECTION_QUANTUM): Remove, replacing with ...
+ (selection_quantum): ... new function, which avoids overflow.
+ All uses changed.
+ (struct selection_data.size): Now ptrdiff_t, not int, to avoid
+ assumption that selection length fits in 'int'.
+ (x_reply_selection_request, x_handle_selection_request)
+ (x_get_window_property, receive_incremental_selection)
+ (x_get_window_property_as_lisp_data, selection_data_to_lisp_data)
+ (lisp_data_to_selection_data, clean_local_selection_data):
+ Use ptrdiff_t, not int, to record length of selection.
+ (x_reply_selection_request, x_get_window_property)
+ (receive_incremental_selection, x_property_data_to_lisp):
+ Redo calculations to avoid overflow.
+ (x_reply_selection_request): When sending hint, ceiling it at
+ X_ULONG_MAX rather than relying on wraparound overflow to send
+ something.
+ (x_get_window_property, receive_incremental_selection)
+ (lisp_data_to_selection_data, x_property_data_to_lisp):
+ Check for size-calculation overflow.
+ (x_get_window_property, receive_incremental_selection)
+ (lisp_data_to_selection_data, Fx_register_dnd_atom):
+ Don't store size until memory allocation succeeds.
+ (x_get_window_property): Plug memory leak on memory exhaustion.
+ Don't double-block input; malloc is safe here. Don't assume 2**34
+ - 4 fits in unsigned long. Add an xassert to check
+ XGetWindowProperty overflow. Be more careful about overflow
+ calculations, and distinguish size from memory overflow better.
+ (receive_incremental_selection): When tracing, don't assume
+ unsigned int is less than INT_MAX.
+ (x_selection_data_to_lisp_data): Remove unnecessary (and in theory
+ harmful) conversions of unsigned short to int.
+ (lisp_data_to_selection_data): Don't assume that integers
+ in the range -65535 through -1 fit in an X unsigned short.
+ Don't assume that ULONG_MAX == X_ULONG_MAX. Don't store into
+ result parameters unless successful. Rely on cons_to_unsigned
+ to report problems with elements; the old code wasn't right anyway.
+ (x_check_property_data): Check for int overflow; we cannot use
+ a wider type due to X limits.
+ (x_handle_dnd_message): Use unsigned int, to avoid int overflow.
+
+ * xsmfns.c (smc_save_yourself_CB): Check for size calc overflow.
+
+ * xterm.c (x_color_cells, handle_one_xevent, x_term_init):
+ Check for size calculation overflow.
+ (x_color_cells): Don't store size until memory allocation succeeds.
+ (handle_one_xevent): Use ptrdiff_t, not int, for byte counts.
+ (x_term_init): Don't assume length fits in int (sprintf is limited
+ to int size).
+
+ Use ptrdiff_t for composition IDs.
+ * character.c (lisp_string_width):
+ * composite.c (composition_table_size, n_compositions)
+ (get_composition_id, composition_gstring_from_id):
+ * dispextern.h (struct glyph_string.cmp_id, struct composition_it.id):
+ * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING):
+ * window.c (Frecenter):
+ Use ptrdiff_t, not int, for composition IDs.
+ * composite.c (get_composition_id): Check for integer overflow.
+ * composite.h: Adjust prototypes to match the above changes.
+
+ Use ptrdiff_t for hash table indexes.
+ * category.c (hash_get_category_set):
+ * ccl.c (ccl_driver):
+ * charset.h (struct charset.hash_index, CHECK_CHARSET_GET_ID):
+ * coding.c (coding_system_charset_list, detect_coding_system):
+ * coding.h (struct coding_system.id):
+ * composite.c (get_composition_id, gstring_lookup_cache):
+ * fns.c (hash_lookup, hash_put, Fgethash, Fputhash):
+ * image.c (xpm_get_color_table_h):
+ * lisp.h (hash_lookup, hash_put):
+ * minibuf.c (Ftest_completion):
+ Use ptrdiff_t for hash table indexes, not int (which is too
+ narrow, on 64-bit hosts) or EMACS_INT (which is too wide, on
+ 32-bit --with-wide-int hosts).
+
+ * charset.c (Fdefine_charset_internal): Check for integer overflow.
+ Add a FIXME comment about memory leaks.
+ (syms_of_charset): Don't assume xmalloc returns.
+
+ Don't assume that stated character widths fit in int.
+ * character.c (Fchar_width, c_string_width, lisp_string_width):
+ * character.h (CHAR_WIDTH):
+ * indent.c (MULTIBYTE_BYTES_WIDTH):
+ Use sanitize_char_width to avoid undefined and/or bad behavior
+ with outlandish widths.
+ * character.h (sanitize_tab_width): Renamed from sanitize_width,
+ now that we have two such functions. All uses changed.
+ (sanitize_char_width): New inline function.
+
+ Don't assume that tab-width fits in int.
+ * character.h (sanitize_width): New inline function.
+ (SANE_TAB_WIDTH): New macro.
+ (ASCII_CHAR_WIDTH): Use it.
+ * indent.c (sane_tab_width): Remove. All uses replaced by
+ SANE_TAB_WIDTH (current_buffer).
+ * xdisp.c (init_iterator): Use SANE_TAB_WIDTH.
+
+ * fileio.c: Integer overflow issues with file modes.
+ (Fset_file_modes, auto_save_1): Don't assume EMACS_INT fits in int.
+
+ * charset.c (read_hex): New arg OVERFLOW. All uses changed.
+ Remove unreachable code.
+ (read_hex, load_charset_map_from_file): Check for integer overflow.
+
+ * xterm.c: don't go over XClientMessageEvent limit
+ (scroll_bar_windows_size): Now ptrdiff_t, as we prefer signed.
+ (x_send_scroll_bar_event): Likewise. Check that the size does not
+ exceed limits imposed by XClientMessageEvent, as well as the usual
+ ptrdiff_t and size_t limits.
+
+ * keyboard.c: Overflow, signedness and related fixes.
+ (make_lispy_movement): Use same integer type in forward decl
+ that is used in the definition.
+ (read_key_sequence, keyremap_step):
+ Change bufsize argument back to int, undoing my 2011-03-30 change.
+ We prefer signed types, and int is wide enough here.
+ (parse_tool_bar_item): Don't assume tool_bar_max_label_size is less
+ than TYPE_MAXIMUM (EMACS_INT) / 2. Don't let the label size grow
+ larger than STRING_BYTES_BOUND. Use ptrdiff_t for Emacs string
+ length, not size_t. Use ptrdiff_t for index, not int.
+ (keyremap_step, read_key_sequence): Redo bufsize check to avoid
+ possibility of integer overflow.
+
+ Overflow, signedness and related fixes for images.
+
+ * dispextern.h (struct it.stack[0].u.image.image_id)
+ (struct_it.image_id, struct image.id, struct image_cache.size)
+ (struct image_cache.used, struct image_cache.ref_count):
+ * gtkutil.c (update_frame_tool_bar):
+ * image.c (x_reference_bitmap, Fimage_size, Fimage_mask_p)
+ (Fimage_metadata, free_image_cache, clear_image_cache, lookup_image)
+ (cache_image, mark_image_cache, x_kill_gs_process, Flookup_image):
+ * nsmenu.m (update_frame_tool_bar):
+ * xdisp.c (calc_pixel_width_or_height):
+ * xfns.c (image_cache_refcount):
+ Image IDs are now ptrdiff_t, not int, to avoid arbitrary limits
+ on typical 64-bit hosts.
+
+ * image.c (RANGED_INTEGERP, TYPE_RANGED_INTEGERP): New macros.
+ (x_bitmap_pixmap, x_create_x_image_and_pixmap):
+ Omit unnecessary casts to int.
+ (parse_image_spec): Check that integers fall into 'int' range
+ when the callers expect that.
+ (image_ascent): Redo ascent calculation to avoid int overflow.
+ (clear_image_cache): Avoid overflow when sqrt (INT_MAX) < nimages.
+ (lookup_image): Remove unnecessary tests.
+ (xbm_image_p): Locals are now of int, not EMACS_INT,
+ since parse_image_check makes sure they fit into int.
+ (png_load, gif_load, svg_load_image):
+ Prefer int to unsigned where either will do.
+ (tiff_handler): New function, combining the cores of the
+ old tiff_error_handler and tiff_warning_handler. This
+ function is rewritten to use vsnprintf and thereby avoid
+ stack buffer overflows. It uses only the features of vsnprintf
+ that are common to both POSIX and native Microsoft.
+ (tiff_error_handler, tiff_warning_handler): Use it.
+ (tiff_load, gif_load, imagemagick_load_image):
+ Don't assume :index value fits in 'int'.
+ (gif_load): Omit unnecessary cast to double, and avoid double-rounding.
+ (imagemagick_load_image): Check that crop parameters fit into
+ the integer types that MagickCropImage accepts. Don't assume
+ Vimagemagick_render_type has a nonnegative value. Don't assume
+ size_t fits in 'long'.
+ (gs_load): Use printmax_t to print the widest integers possible.
+ Check for integer overflow when computing image height and width.
+
2011-07-28 Andreas Schwab <schwab@linux-m68k.org>
* print.c (print_object): Print empty symbol as ##.
=== modified file 'src/bidi.c'
--- src/bidi.c 2011-07-28 00:24:58 +0000
+++ src/bidi.c 2011-07-29 05:31:12 +0000
@@ -306,6 +306,21 @@
static ptrdiff_t bidi_cache_start = 0; /* start of cache for this
"stack" level */
+/* 5-slot stack for saving the start of the previous level of the
+ cache. xdisp.c maintains a 5-slot stack for its iterator state,
+ and we need the same size of our stack. */
+static ptrdiff_t bidi_cache_start_stack[IT_STACK_SIZE];
+static int bidi_cache_sp;
+
+/* Size of header used by bidi_shelve_cache. */
+enum
+ {
+ bidi_shelve_header_size =
+ (sizeof (bidi_cache_idx) + sizeof (bidi_cache_start_stack)
+ + sizeof (bidi_cache_sp) + sizeof (bidi_cache_start)
+ + sizeof (bidi_cache_last_idx))
+ };
+
/* Reset the cache state to the empty state. We only reset the part
of the cache relevant to iteration of the current object. Previous
objects, which are pushed on the display iterator's stack, are left
@@ -471,7 +486,8 @@
max (BUF_BYTES_MAX, STRING_BYTES_BOUND);
/* Also, it cannot be larger than what C can represent. */
- ptrdiff_t c_bound = min (PTRDIFF_MAX, SIZE_MAX) / elsz;
+ ptrdiff_t c_bound =
+ (min (PTRDIFF_MAX, SIZE_MAX) - bidi_shelve_header_size) / elsz;
if (min (string_or_buffer_bound, c_bound) <= idx)
memory_full (SIZE_MAX);
@@ -568,11 +584,6 @@
/***********************************************************************
Pushing and popping the bidi iterator state
***********************************************************************/
-/* 5-slot stack for saving the start of the previous level of the
- cache. xdisp.c maintains a 5-slot stack for its iterator state,
- and we need the same size of our stack. */
-static ptrdiff_t bidi_cache_start_stack[IT_STACK_SIZE];
-static int bidi_cache_sp;
/* Push the bidi iterator state in preparation for reordering a
different object, e.g. display string found at certain buffer
@@ -629,11 +640,8 @@
if (bidi_cache_idx == 0)
return NULL;
- databuf = xmalloc (sizeof (bidi_cache_idx)
- + bidi_cache_idx * sizeof (struct bidi_it)
- + sizeof (bidi_cache_start_stack)
- + sizeof (bidi_cache_sp) + sizeof (bidi_cache_start)
- + sizeof (bidi_cache_last_idx));
+ databuf = xmalloc (bidi_shelve_header_size
+ + bidi_cache_idx * sizeof (struct bidi_it));
memcpy (databuf, &bidi_cache_idx, sizeof (bidi_cache_idx));
memcpy (databuf + sizeof (bidi_cache_idx),
bidi_cache, bidi_cache_idx * sizeof (struct bidi_it));
=== modified file 'src/buffer.c'
--- src/buffer.c 2011-07-28 17:46:21 +0000
+++ src/buffer.c 2011-07-29 05:31:12 +0000
@@ -2572,9 +2572,9 @@
memory_full (SIZE_MAX);
/* Make it work with an initial len == 0. */
len = len * 2 + 4;
- *len_ptr = len;
vec = (Lisp_Object *) xrealloc (vec, len * sizeof
(Lisp_Object));
*vec_ptr = vec;
+ *len_ptr = len;
}
else
inhibit_storing = 1;
@@ -2615,9 +2615,9 @@
memory_full (SIZE_MAX);
/* Make it work with an initial len == 0. */
len = len * 2 + 4;
- *len_ptr = len;
vec = (Lisp_Object *) xrealloc (vec, len * sizeof
(Lisp_Object));
*vec_ptr = vec;
+ *len_ptr = len;
}
else
inhibit_storing = 1;
@@ -2712,9 +2712,9 @@
memory_full (SIZE_MAX);
/* Make it work with an initial len == 0. */
len = len * 2 + 4;
- *len_ptr = len;
vec = (Lisp_Object *) xrealloc (vec, len * sizeof
(Lisp_Object));
*vec_ptr = vec;
+ *len_ptr = len;
}
else
inhibit_storing = 1;
@@ -2760,9 +2760,9 @@
memory_full (SIZE_MAX);
/* Make it work with an initial len == 0. */
len = len * 2 + 4;
- *len_ptr = len;
vec = (Lisp_Object *) xrealloc (vec, len * sizeof
(Lisp_Object));
*vec_ptr = vec;
+ *len_ptr = len;
}
else
inhibit_storing = 1;
@@ -2978,15 +2978,12 @@
if (ssl->used == ssl->size)
{
- if (min (PTRDIFF_MAX, SIZE_MAX) / (sizeof (struct sortstr) * 2)
- < ssl->size)
+ ptrdiff_t ssl_size = 0 < ssl->size ? ssl->size * 2 : 5;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (struct sortstr) < ssl_size)
memory_full (SIZE_MAX);
- else if (0 < ssl->size)
- ssl->size *= 2;
- else
- ssl->size = 5;
ssl->buf = ((struct sortstr *)
- xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr)));
+ xrealloc (ssl->buf, ssl_size * sizeof (struct sortstr)));
+ ssl->size = ssl_size;
}
ssl->buf[ssl->used].string = str;
ssl->buf[ssl->used].string2 = str2;
@@ -3111,9 +3108,9 @@
if (total > overlay_str_len)
{
- overlay_str_len = total;
overlay_str_buf = (unsigned char *)xrealloc (overlay_str_buf,
total);
+ overlay_str_len = total;
}
p = overlay_str_buf;
for (i = overlay_tails.used; --i >= 0;)
=== modified file 'src/callproc.c'
--- src/callproc.c 2011-07-28 01:46:23 +0000
+++ src/callproc.c 2011-07-29 05:31:12 +0000
@@ -1147,9 +1147,11 @@
cleaned up in the usual way. */
{
register char *temp;
- register int i;
+ register ptrdiff_t i;
i = SBYTES (current_dir);
+ if (min (PTRDIFF_MAX, SIZE_MAX) - 6 < i)
+ memory_full (SIZE_MAX);
#ifdef MSDOS
/* MSDOS must have all environment variables malloc'ed, because
low-level libc functions that launch subsidiary processes rely
=== modified file 'src/category.c'
--- src/category.c 2011-06-24 21:25:22 +0000
+++ src/category.c 2011-07-19 06:07:07 +0000
@@ -67,7 +67,7 @@
hash_get_category_set (Lisp_Object table, Lisp_Object category_set)
{
struct Lisp_Hash_Table *h;
- EMACS_INT i;
+ ptrdiff_t i;
EMACS_UINT hash;
if (NILP (XCHAR_TABLE (table)->extras[1]))
=== modified file 'src/ccl.c'
--- src/ccl.c 2011-06-24 21:25:22 +0000
+++ src/ccl.c 2011-07-28 20:29:44 +0000
@@ -1303,7 +1303,7 @@
case CCL_LookupIntConstTbl:
{
- EMACS_INT eop;
+ ptrdiff_t eop;
struct Lisp_Hash_Table *h;
GET_CCL_RANGE (eop, ccl_prog, ic++, 0,
(VECTORP (Vtranslation_hash_table_vector)
@@ -1329,7 +1329,7 @@
case CCL_LookupCharConstTbl:
{
- EMACS_INT eop;
+ ptrdiff_t eop;
struct Lisp_Hash_Table *h;
GET_CCL_RANGE (eop, ccl_prog, ic++, 0,
(VECTORP (Vtranslation_hash_table_vector)
@@ -2061,12 +2061,12 @@
Lisp_Object val;
struct ccl_program ccl;
int i;
- EMACS_INT outbufsize;
+ ptrdiff_t outbufsize;
unsigned char *outbuf, *outp;
- EMACS_INT str_chars, str_bytes;
+ ptrdiff_t str_chars, str_bytes;
#define CCL_EXECUTE_BUF_SIZE 1024
int source[CCL_EXECUTE_BUF_SIZE], destination[CCL_EXECUTE_BUF_SIZE];
- EMACS_INT consumed_chars, consumed_bytes, produced_chars;
+ ptrdiff_t consumed_chars, consumed_bytes, produced_chars;
if (setup_ccl_program (&ccl, ccl_prog) < 0)
error ("Invalid CCL program");
@@ -2093,6 +2093,10 @@
ccl.ic = i;
}
+ if (((min (PTRDIFF_MAX, SIZE_MAX) - 256)
+ / (ccl.buf_magnification ? ccl.buf_magnification : 1))
+ < str_bytes)
+ memory_full (SIZE_MAX);
outbufsize = (ccl.buf_magnification
? str_bytes * ccl.buf_magnification + 256
: str_bytes + 256);
@@ -2127,11 +2131,19 @@
produced_chars += ccl.produced;
if (NILP (unibyte_p))
{
- if (outp - outbuf + MAX_MULTIBYTE_LENGTH * ccl.produced
- > outbufsize)
+ ptrdiff_t offset = outp - outbuf;
+ if ((outbufsize - offset) / MAX_MULTIBYTE_LENGTH < ccl.produced)
{
- EMACS_INT offset = outp - outbuf;
- outbufsize += MAX_MULTIBYTE_LENGTH * ccl.produced;
+ ptrdiff_t produced;
+ if (((min (PTRDIFF_MAX, SIZE_MAX) - outbufsize)
+ / MAX_MULTIBYTE_LENGTH)
+ < ccl.produced)
+ {
+ xfree (outbuf);
+ memory_full (SIZE_MAX);
+ }
+ produced = ccl.produced;
+ outbufsize += MAX_MULTIBYTE_LENGTH * produced;
outbuf = (unsigned char *) xrealloc (outbuf, outbufsize);
outp = outbuf + offset;
}
@@ -2140,9 +2152,14 @@
}
else
{
- if (outp - outbuf + ccl.produced > outbufsize)
+ ptrdiff_t offset = outp - outbuf;
+ if (outbufsize - offset < ccl.produced)
{
- EMACS_INT offset = outp - outbuf;
+ if (min (PTRDIFF_MAX, SIZE_MAX) - outbufsize < ccl.produced)
+ {
+ xfree (outbuf);
+ memory_full (SIZE_MAX);
+ }
outbufsize += ccl.produced;
outbuf = (unsigned char *) xrealloc (outbuf, outbufsize);
outp = outbuf + offset;
=== modified file 'src/character.c'
--- src/character.c 2011-07-12 21:17:39 +0000
+++ src/character.c 2011-07-28 20:30:20 +0000
@@ -326,7 +326,7 @@
disp = dp ? DISP_CHAR_VECTOR (dp, c) : Qnil;
if (VECTORP (disp))
- width = ASIZE (disp);
+ width = sanitize_char_width (ASIZE (disp));
else
width = CHAR_WIDTH (c);
@@ -358,7 +358,7 @@
{
val = DISP_CHAR_VECTOR (dp, c);
if (VECTORP (val))
- thiswidth = ASIZE (val);
+ thiswidth = sanitize_char_width (ASIZE (val));
else
thiswidth = CHAR_WIDTH (c);
}
@@ -423,7 +423,7 @@
{
EMACS_INT chars, bytes, thiswidth;
Lisp_Object val;
- int cmp_id;
+ ptrdiff_t cmp_id;
EMACS_INT ignore, end;
if (find_composition (i, -1, &ignore, &end, &val, string)
@@ -451,7 +451,7 @@
{
val = DISP_CHAR_VECTOR (dp, c);
if (VECTORP (val))
- thiswidth = ASIZE (val);
+ thiswidth = sanitize_char_width (ASIZE (val));
else
thiswidth = CHAR_WIDTH (c);
}
@@ -902,6 +902,8 @@
Lisp_Object str;
USE_SAFE_ALLOCA;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / MAX_MULTIBYTE_LENGTH < n)
+ memory_full (SIZE_MAX);
SAFE_ALLOCA (buf, unsigned char *, MAX_MULTIBYTE_LENGTH * n);
p = buf;
=== modified file 'src/character.h'
--- src/character.h 2011-07-06 23:28:00 +0000
+++ src/character.h 2011-07-19 00:42:24 +0000
@@ -556,6 +556,16 @@
} while (0)
+/* Return a non-outlandish value for the tab width. */
+
+#define SANE_TAB_WIDTH(buf) \
+ sanitize_tab_width (XFASTINT (BVAR (buf, tab_width)))
+static inline int
+sanitize_tab_width (EMACS_INT width)
+{
+ return 0 < width && width <= 1000 ? width : 8;
+}
+
/* Return the width of ASCII character C. The width is measured by
how many columns C will occupy on the screen when displayed in the
current buffer. */
@@ -563,12 +573,20 @@
#define ASCII_CHAR_WIDTH(c) \
(c < 0x20 \
? (c == '\t'
\
- ? XFASTINT (BVAR (current_buffer, tab_width))
\
+ ? SANE_TAB_WIDTH (current_buffer)
\
: (c == '\n' ? 0 : (NILP (BVAR (current_buffer, ctl_arrow)) ? 4 : 2)))
\
: (c < 0x7f \
? 1 \
: ((NILP (BVAR (current_buffer, ctl_arrow)) ? 4 : 2))))
+/* Return a non-outlandish value for a character width. */
+
+static inline int
+sanitize_char_width (EMACS_INT width)
+{
+ return 0 <= width && width <= 1000 ? width : 1000;
+}
+
/* Return the width of character C. The width is measured by how many
columns C will occupy on the screen when displayed in the current
buffer. */
@@ -576,7 +594,7 @@
#define CHAR_WIDTH(c) \
(ASCII_CHAR_P (c) \
? ASCII_CHAR_WIDTH (c) \
- : XINT (CHAR_TABLE_REF (Vchar_width_table, c)))
+ : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c))))
/* If C is a variation selector, return the index numnber of the
variation selector (1..256). Otherwise, return 0. */
=== modified file 'src/charset.c'
--- src/charset.c 2011-06-14 18:57:19 +0000
+++ src/charset.c 2011-07-19 03:34:13 +0000
@@ -419,7 +419,7 @@
paying attention to comment character '#'. */
static inline unsigned
-read_hex (FILE *fp, int *eof)
+read_hex (FILE *fp, int *eof, int *overflow)
{
int c;
unsigned n;
@@ -441,15 +441,16 @@
*eof = 1;
return 0;
}
- *eof = 0;
n = 0;
- if (c == 'x')
- while ((c = getc (fp)) != EOF && isxdigit (c))
+ while (isxdigit (c = getc (fp)))
+ {
+ if (UINT_MAX >> 4 < n)
+ *overflow = 1;
n = ((n << 4)
- | (c <= '9' ? c - '0' : c <= 'F' ? c - 'A' + 10 : c - 'a' + 10));
- else
- while ((c = getc (fp)) != EOF && isdigit (c))
- n = (n * 10) + c - '0';
+ | (c - ('0' <= c && c <= '9' ? '0'
+ : 'A' <= c && c <= 'F' ? 'A' - 10
+ : 'a' - 10)));
+ }
if (c != EOF)
ungetc (c, fp);
return n;
@@ -479,7 +480,6 @@
unsigned max_code = CHARSET_MAX_CODE (charset);
int fd;
FILE *fp;
- int eof;
Lisp_Object suffixes;
struct charset_map_entries *head, *entries;
int n_entries, count;
@@ -504,22 +504,27 @@
memset (entries, 0, sizeof (struct charset_map_entries));
n_entries = 0;
- eof = 0;
while (1)
{
- unsigned from, to;
- int c;
+ unsigned from, to, c;
int idx;
+ int eof = 0, overflow = 0;
- from = read_hex (fp, &eof);
+ from = read_hex (fp, &eof, &overflow);
if (eof)
break;
if (getc (fp) == '-')
- to = read_hex (fp, &eof);
+ to = read_hex (fp, &eof, &overflow);
else
to = from;
- c = (int) read_hex (fp, &eof);
+ if (eof)
+ break;
+ c = read_hex (fp, &eof, &overflow);
+ if (eof)
+ break;
+ if (overflow)
+ continue;
if (from < min_code || to > max_code || from > to || c > MAX_CHAR)
continue;
@@ -1145,13 +1150,28 @@
hash_code);
if (charset_table_used == charset_table_size)
{
- struct charset *new_table
+ struct charset *new_table;
+ /* Ensure that charset IDs fit into 'int' as well as into the
+ restriction imposed by fixnums, ptrdiff_t, and size_t.
+ Although the 'int' restriction could be removed, too much other
+ code would need altering; for example, the IDs are stuffed into
+ struct coding_system.charbuf[i] entries, which are 'int'. */
+ int charset_table_size_max =
+ min (min (INT_MAX, MOST_POSITIVE_FIXNUM),
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof (struct charset));
+ if (charset_table_size_max - 16 < charset_table_size)
+ memory_full (SIZE_MAX);
+ new_table
= (struct charset *) xmalloc (sizeof (struct charset)
* (charset_table_size + 16));
memcpy (new_table, charset_table,
sizeof (struct charset) * charset_table_size);
charset_table_size += 16;
charset_table = new_table;
+ /* FIXME: Doesn't this leak memory? The old charset_table
+ becomes unreachable. If the memory leak is intentional,
+ a comment should be added to explain this. If not, the
+ old charset_table should be freed, using xfree. */
}
id = charset_table_used++;
new_definition_p = 1;
@@ -2342,9 +2362,8 @@
Vcharset_hash_table = Fmake_hash_table (2, args);
}
+ charset_table = (struct charset *) xmalloc (sizeof (struct charset) * 128);
charset_table_size = 128;
- charset_table = ((struct charset *)
- xmalloc (sizeof (struct charset) * charset_table_size));
charset_table_used = 0;
defsubr (&Scharsetp);
=== modified file 'src/charset.h'
--- src/charset.h 2011-06-15 18:57:45 +0000
+++ src/charset.h 2011-07-19 06:07:07 +0000
@@ -148,7 +148,7 @@
int id;
/* Index to Vcharset_hash_table. */
- EMACS_INT hash_index;
+ ptrdiff_t hash_index;
/* Dimension of the charset: 1, 2, 3, or 4. */
int dimension;
@@ -341,7 +341,7 @@
number of the charset. Otherwise, signal an error. */
#define CHECK_CHARSET_GET_ID(x, id) \
do { \
- int idx; \
+ ptrdiff_t idx; \
\
if (! SYMBOLP (x) || (idx = CHARSET_SYMBOL_HASH_INDEX (x)) < 0) \
wrong_type_argument (Qcharsetp, (x)); \
=== modified file 'src/coding.c'
--- src/coding.c 2011-07-01 11:03:55 +0000
+++ src/coding.c 2011-07-28 20:31:29 +0000
@@ -5838,7 +5838,7 @@
Lisp_Object
coding_system_charset_list (Lisp_Object coding_system)
{
- int id;
+ ptrdiff_t id;
Lisp_Object attrs, charset_list;
CHECK_CODING_SYSTEM_GET_ID (coding_system, id);
@@ -6683,8 +6683,12 @@
break;
}
- if (dst + MAX_MULTIBYTE_LENGTH * to_nchars > dst_end)
+ if ((dst_end - dst) / MAX_MULTIBYTE_LENGTH < to_nchars)
{
+ if (((min (PTRDIFF_MAX, SIZE_MAX) - (buf_end - buf))
+ / MAX_MULTIBYTE_LENGTH)
+ < to_nchars)
+ memory_full (SIZE_MAX);
dst = alloc_destination (coding,
buf_end - buf
+ MAX_MULTIBYTE_LENGTH * to_nchars,
@@ -7888,11 +7892,10 @@
}
else if (EQ (dst_object, Qt))
{
+ ptrdiff_t dst_bytes = max (1, coding->src_chars);
coding->dst_object = Qnil;
- coding->dst_bytes = coding->src_chars;
- if (coding->dst_bytes == 0)
- coding->dst_bytes = 1;
- coding->destination = (unsigned char *) xmalloc (coding->dst_bytes);
+ coding->destination = (unsigned char *) xmalloc (dst_bytes);
+ coding->dst_bytes = dst_bytes;
coding->dst_multibyte = 0;
}
else
@@ -8076,7 +8079,7 @@
Lisp_Object attrs, eol_type;
Lisp_Object val = Qnil;
struct coding_system coding;
- int id;
+ ptrdiff_t id;
struct coding_detection_info detect_info;
enum coding_category base_category;
int null_byte_found = 0, eight_bit_found = 0;
=== modified file 'src/coding.h'
--- src/coding.h 2011-04-11 06:58:57 +0000
+++ src/coding.h 2011-07-19 06:07:07 +0000
@@ -415,7 +415,7 @@
setup_coding_system. At the early stage of building time, this
value is -1 in the array coding_categories to indicate that no
coding-system of that category is yet defined. */
- int id;
+ ptrdiff_t id;
/* Flag bits of the coding system. The meaning of each bit is common
to all types of coding systems. */
=== modified file 'src/composite.c'
--- src/composite.c 2011-07-09 06:28:40 +0000
+++ src/composite.c 2011-07-28 20:35:09 +0000
@@ -142,10 +142,10 @@
struct composition **composition_table;
/* The current size of `composition_table'. */
-static int composition_table_size;
+static ptrdiff_t composition_table_size;
/* Number of compositions currently made. */
-int n_compositions;
+ptrdiff_t n_compositions;
/* Hash table for compositions. The key is COMPONENTS-VEC of
`composition' property. The value is the corresponding
@@ -172,19 +172,29 @@
If the composition is invalid, return -1. */
-int
+ptrdiff_t
get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
Lisp_Object prop, Lisp_Object string)
{
Lisp_Object id, length, components, key, *key_contents;
- int glyph_len;
+ ptrdiff_t glyph_len;
struct Lisp_Hash_Table *hash_table = XHASH_TABLE (composition_hash_table);
- EMACS_INT hash_index;
+ ptrdiff_t hash_index;
EMACS_UINT hash_code;
+ enum composition_method method;
struct composition *cmp;
EMACS_INT i;
int ch;
+ /* Maximum length of a string of glyphs. XftGlyphExtents limits this
+ to INT_MAX, and Emacs may limit it further. */
+ enum {
+ glyph_len_max =
+ min (INT_MAX,
+ (min (PTRDIFF_MAX, SIZE_MAX)
+ / max (MAX_MULTIBYTE_LENGTH, 2 * sizeof (short))))
+ };
+
/* PROP should be
Form-A: ((LENGTH . COMPONENTS) . MODIFICATION-FUNC)
or
@@ -260,18 +270,22 @@
/* Check if we have sufficient memory to store this information. */
if (composition_table_size == 0)
{
+ composition_table
+ = (struct composition **) xmalloc (sizeof (composition_table[0]) * 256);
composition_table_size = 256;
- composition_table
- = (struct composition **) xmalloc (sizeof (composition_table[0])
- * composition_table_size);
}
else if (composition_table_size <= n_compositions)
{
- composition_table_size += 256;
+ if ((min (MOST_POSITIVE_FIXNUM,
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof composition_table[0])
+ - 256)
+ < composition_table_size)
+ memory_full (SIZE_MAX);
composition_table
= (struct composition **) xrealloc (composition_table,
sizeof (composition_table[0])
- * composition_table_size);
+ * (composition_table_size + 256));
+ composition_table_size += 256;
}
key_contents = XVECTOR (key)->contents;
@@ -316,18 +330,24 @@
/* Register the composition in composition_hash_table. */
hash_index = hash_put (hash_table, key, id, hash_code);
+ method = (NILP (components)
+ ? COMPOSITION_RELATIVE
+ : ((INTEGERP (components) || STRINGP (components))
+ ? COMPOSITION_WITH_ALTCHARS
+ : COMPOSITION_WITH_RULE_ALTCHARS));
+
+ glyph_len = (method == COMPOSITION_WITH_RULE_ALTCHARS
+ ? (ASIZE (key) + 1) / 2
+ : ASIZE (key));
+
+ if (glyph_len_max < glyph_len)
+ memory_full (SIZE_MAX);
+
/* Register the composition in composition_table. */
cmp = (struct composition *) xmalloc (sizeof (struct composition));
- cmp->method = (NILP (components)
- ? COMPOSITION_RELATIVE
- : ((INTEGERP (components) || STRINGP (components))
- ? COMPOSITION_WITH_ALTCHARS
- : COMPOSITION_WITH_RULE_ALTCHARS));
+ cmp->method = method;
cmp->hash_index = hash_index;
- glyph_len = (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS
- ? (ASIZE (key) + 1) / 2
- : ASIZE (key));
cmp->glyph_len = glyph_len;
cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2);
cmp->font = NULL;
@@ -656,7 +676,7 @@
gstring_lookup_cache (Lisp_Object header)
{
struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table);
- EMACS_INT i = hash_lookup (h, header, NULL);
+ ptrdiff_t i = hash_lookup (h, header, NULL);
return (i >= 0 ? HASH_VALUE (h, i) : Qnil);
}
@@ -691,7 +711,7 @@
}
Lisp_Object
-composition_gstring_from_id (int id)
+composition_gstring_from_id (ptrdiff_t id)
{
struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table);
=== modified file 'src/composite.h'
--- src/composite.h 2011-06-12 23:25:12 +0000
+++ src/composite.h 2011-07-28 20:35:41 +0000
@@ -193,7 +193,7 @@
void *font;
/* Pointer to an array of x-offset and y-offset (by pixels) of
- glyphs. This points to a sufficient memory space (sizeof (int) *
+ glyphs. This points to a sufficient memory space (sizeof (short) *
glyph_len * 2) that is allocated when the composition is
registered in composition_table. X-offset and Y-offset of Nth
glyph are (2N)th and (2N+1)th elements respectively. */
@@ -204,7 +204,7 @@
COMPOSITION-ID. */
extern struct composition **composition_table;
/* Number of the currently registered compositions. */
-extern int n_compositions;
+extern ptrdiff_t n_compositions;
/* Mask bits for CHECK_MASK arg to update_compositions.
For a change in the region FROM and TO, check compositions ... */
@@ -216,8 +216,8 @@
extern Lisp_Object Qcomposition;
extern Lisp_Object composition_hash_table;
-extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT,
- Lisp_Object, Lisp_Object);
+extern ptrdiff_t get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT,
+ Lisp_Object, Lisp_Object);
extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *,
Lisp_Object *, Lisp_Object);
extern void update_compositions (EMACS_INT, EMACS_INT, int);
@@ -299,7 +299,7 @@
struct font_metrics;
extern Lisp_Object composition_gstring_put_cache (Lisp_Object, EMACS_INT);
-extern Lisp_Object composition_gstring_from_id (int);
+extern Lisp_Object composition_gstring_from_id (ptrdiff_t);
extern int composition_gstring_p (Lisp_Object);
extern int composition_gstring_width (Lisp_Object, EMACS_INT, EMACS_INT,
struct font_metrics *);
=== modified file 'src/dispextern.h'
--- src/dispextern.h 2011-07-14 17:28:42 +0000
+++ src/dispextern.h 2011-07-28 21:31:33 +0000
@@ -575,7 +575,7 @@
struct glyph *glyphs;
/* Allocated size of `glyphs'. */
- int nglyphs;
+ ptrdiff_t nglyphs;
/* Number of rows and columns in a matrix. */
int nrows, ncolumns;
@@ -1240,7 +1240,7 @@
struct composition *cmp;
/* If not negative, this string describes a compos. */
- int cmp_id;
+ ptrdiff_t cmp_id;
/* Start and end glyph indices in a glyph-string. */
int cmp_from, cmp_to;
@@ -2056,7 +2056,7 @@
EMACS_INT stop_pos;
/* ID number of the composition or glyph-string. If negative, we
are not iterating over a composition now. */
- int id;
+ ptrdiff_t id;
/* If non-negative, character that triggers the automatic
composition at `stop_pos', and this is an automatic composition.
If negative, this is a static composition. This is set to -2
@@ -2246,7 +2246,7 @@
struct {
Lisp_Object object;
struct it_slice slice;
- int image_id;
+ ptrdiff_t image_id;
} image;
/* method == GET_FROM_COMPOSITION */
struct {
@@ -2376,7 +2376,7 @@
enum glyphless_display_method glyphless_method;
/* If what == IT_IMAGE, the id of the image to display. */
- int image_id;
+ ptrdiff_t image_id;
/* Values from `slice' property. */
struct it_slice slice;
@@ -2826,7 +2826,7 @@
EMACS_UINT hash;
/* Image id of this image. */
- int id;
+ ptrdiff_t id;
/* Hash collision chain. */
struct image *next, *prev;
@@ -2845,13 +2845,13 @@
struct image **images;
/* Allocated size of `images'. */
- unsigned size;
+ ptrdiff_t size;
/* Number of images in the cache. */
- unsigned used;
+ ptrdiff_t used;
/* Reference count (number of frames sharing this cache). */
- int refcount;
+ ptrdiff_t refcount;
};
@@ -3117,7 +3117,7 @@
extern int x_bitmap_height (struct frame *, ptrdiff_t);
extern int x_bitmap_width (struct frame *, ptrdiff_t);
extern int x_bitmap_pixmap (struct frame *, ptrdiff_t);
-extern void x_reference_bitmap (struct frame *, int);
+extern void x_reference_bitmap (struct frame *, ptrdiff_t);
extern ptrdiff_t x_create_bitmap_from_data (struct frame *, char *,
unsigned int, unsigned int);
extern ptrdiff_t x_create_bitmap_from_file (struct frame *, Lisp_Object);
@@ -3138,7 +3138,7 @@
void mark_image_cache (struct image_cache *);
int valid_image_p (Lisp_Object);
void prepare_image_for_display (struct frame *, struct image *);
-int lookup_image (struct frame *, Lisp_Object);
+ptrdiff_t lookup_image (struct frame *, Lisp_Object);
unsigned long image_background (struct image *, struct frame *,
XImagePtr_or_DC ximg);
=== modified file 'src/dispnew.c'
--- src/dispnew.c 2011-07-14 20:40:35 +0000
+++ src/dispnew.c 2011-07-28 21:31:33 +0000
@@ -499,7 +499,10 @@
/* Enlarge MATRIX->rows if necessary. New rows are cleared. */
if (matrix->rows_allocated < dim.height)
{
- ptrdiff_t size = dim.height * sizeof (struct glyph_row);
+ ptrdiff_t size;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (struct glyph_row) < dim.height)
+ memory_full (SIZE_MAX);
+ size = dim.height * sizeof (struct glyph_row);
new_rows = dim.height - matrix->rows_allocated;
matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size);
memset (matrix->rows + matrix->rows_allocated, 0,
@@ -573,6 +576,9 @@
struct glyph_row *row = matrix->rows;
struct glyph_row *end = row + matrix->rows_allocated;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (struct glyph) < dim.width)
+ memory_full (SIZE_MAX);
+
while (row < end)
{
row->glyphs[LEFT_MARGIN_AREA]
@@ -1217,7 +1223,7 @@
struct glyph *end = beg + row->used[TEXT_AREA];
int len;
Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE;
- int glyph_table_len = GLYPH_TABLE_LENGTH;
+ ptrdiff_t glyph_table_len = GLYPH_TABLE_LENGTH;
/* Ignore trailing and leading spaces if we can. */
if (!FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME
OK here? */
@@ -1391,31 +1397,26 @@
static int
realloc_glyph_pool (struct glyph_pool *pool, struct dim matrix_dim)
{
- int needed;
+ ptrdiff_t needed;
int changed_p;
changed_p = (pool->glyphs == 0
|| matrix_dim.height != pool->nrows
|| matrix_dim.width != pool->ncolumns);
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (struct glyph) / matrix_dim.width
+ < matrix_dim.height)
+ memory_full (SIZE_MAX);
+
/* Enlarge the glyph pool. */
- needed = matrix_dim.width * matrix_dim.height;
+ needed = matrix_dim.width;
+ needed *= matrix_dim.height;
if (needed > pool->nglyphs)
{
ptrdiff_t size = needed * sizeof (struct glyph);
-
- if (pool->glyphs)
- {
- pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size);
- memset (pool->glyphs + pool->nglyphs, 0,
- size - pool->nglyphs * sizeof (struct glyph));
- }
- else
- {
- pool->glyphs = (struct glyph *) xmalloc (size);
- memset (pool->glyphs, 0, size);
- }
-
+ pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size);
+ memset (pool->glyphs + pool->nglyphs, 0,
+ size - pool->nglyphs * sizeof (struct glyph));
pool->nglyphs = needed;
}
@@ -4166,7 +4167,7 @@
int new_line_number;
/* Bucket index of this row_entry in the hash table row_table. */
- int bucket;
+ ptrdiff_t bucket;
/* The row described by this entry. */
struct glyph_row *row;
@@ -4180,18 +4181,18 @@
that we need a larger one. */
static struct row_entry *row_entry_pool;
-static int row_entry_pool_size;
+static ptrdiff_t row_entry_pool_size;
/* Index of next free entry in row_entry_pool. */
-static int row_entry_idx;
+static ptrdiff_t row_entry_idx;
/* The hash table used during scrolling, and the table's size. This
table is used to quickly identify equal rows in the desired and
current matrix. */
static struct row_entry **row_table;
-static int row_table_size;
+static ptrdiff_t row_table_size;
/* Vectors of pointers to row_entry structures belonging to the
current and desired matrix, and the size of the vectors. */
@@ -4214,7 +4215,7 @@
add_row_entry (struct glyph_row *row)
{
struct row_entry *entry;
- int i = row->hash % row_table_size;
+ ptrdiff_t i = row->hash % row_table_size;
entry = row_table[i];
while (entry && !row_equal_p (entry->row, row, 1))
@@ -4267,9 +4268,10 @@
struct glyph_matrix *desired_matrix = w->desired_matrix;
struct glyph_matrix *current_matrix = w->current_matrix;
int yb = window_text_bottom_y (w);
- int i, j, first_old, first_new, last_old, last_new;
- int nruns, n, run_idx;
- ptrdiff_t nbytes;
+ ptrdiff_t i;
+ int j, first_old, first_new, last_old, last_new;
+ int nruns, run_idx;
+ ptrdiff_t n, nbytes;
struct row_entry *entry;
struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
@@ -4354,45 +4356,77 @@
if (last_new == first_new)
return 0;
+ /* Check for integer overflow in xrealloc size calculation.
+
+ If next_almost_prime checks (N) for divisibility by 2..10, then
+ it can return at most N + 10, e.g., next_almost_prime (1) == 11.
+ So, set next_almost_prime_increment_max to 10.
+
+ It's just a coincidence that next_almost_prime_increment_max ==
+ NEXT_ALMOST_PRIME_LIMIT - 1. If NEXT_ALMOST_PRIME_LIMIT were
+ 13, then next_almost_prime_increment_max would be 14, e.g.,
+ because next_almost_prime (113) would be 127. */
+ {
+ verify (NEXT_ALMOST_PRIME_LIMIT == 11);
+ enum { next_almost_prime_increment_max = 10 };
+ ptrdiff_t alloc_max = min (PTRDIFF_MAX, SIZE_MAX);
+ ptrdiff_t row_table_max =
+ ((alloc_max - next_almost_prime_increment_max)
+ / (3 * sizeof *row_table));
+ ptrdiff_t row_entry_pool_max = alloc_max / sizeof *row_entry_pool;
+ int n_max = min (INT_MAX, min (row_table_max, row_entry_pool_max));
+ ptrdiff_t old_lines_max = alloc_max / sizeof *old_lines;
+ int current_nrows_max = min (n_max - desired_matrix->nrows, old_lines_max);
+ int desired_nrows_max =
+ min (INT_MAX,
+ alloc_max / max (sizeof *new_lines,
+ max (sizeof *runs, sizeof *run_pool)));
+ if (current_nrows_max < current_matrix->nrows
+ || desired_nrows_max < desired_matrix->nrows)
+ memory_full (SIZE_MAX);
+ }
+
/* Reallocate vectors, tables etc. if necessary. */
if (current_matrix->nrows > old_lines_size)
{
+ nbytes = current_matrix->nrows * sizeof *old_lines;
+ old_lines = (struct row_entry **) xrealloc (old_lines, nbytes);
old_lines_size = current_matrix->nrows;
- nbytes = old_lines_size * sizeof *old_lines;
- old_lines = (struct row_entry **) xrealloc (old_lines, nbytes);
}
if (desired_matrix->nrows > new_lines_size)
{
+ nbytes = desired_matrix->nrows * sizeof *new_lines;
+ new_lines = (struct row_entry **) xrealloc (new_lines, nbytes);
new_lines_size = desired_matrix->nrows;
- nbytes = new_lines_size * sizeof *new_lines;
- new_lines = (struct row_entry **) xrealloc (new_lines, nbytes);
}
- n = desired_matrix->nrows + current_matrix->nrows;
- if (3 * n > row_table_size)
+ n = desired_matrix->nrows;
+ n += current_matrix->nrows;
+ if (row_table_size / 3 < n)
{
- row_table_size = next_almost_prime (3 * n);
- nbytes = row_table_size * sizeof *row_table;
+ ptrdiff_t size = next_almost_prime (3 * n);
+ nbytes = size * sizeof *row_table;
row_table = (struct row_entry **) xrealloc (row_table, nbytes);
+ row_table_size = size;
memset (row_table, 0, nbytes);
}
if (n > row_entry_pool_size)
{
+ nbytes = n * sizeof *row_entry_pool;
+ row_entry_pool = (struct row_entry *) xrealloc (row_entry_pool, nbytes);
row_entry_pool_size = n;
- nbytes = row_entry_pool_size * sizeof *row_entry_pool;
- row_entry_pool = (struct row_entry *) xrealloc (row_entry_pool, nbytes);
}
if (desired_matrix->nrows > runs_size)
{
- runs_size = desired_matrix->nrows;
- nbytes = runs_size * sizeof *runs;
+ nbytes = desired_matrix->nrows * sizeof *runs;
runs = (struct run **) xrealloc (runs, nbytes);
- nbytes = runs_size * sizeof *run_pool;
+ nbytes = desired_matrix->nrows * sizeof *run_pool;
run_pool = (struct run *) xrealloc (run_pool, nbytes);
+ runs_size = desired_matrix->nrows;
}
nruns = run_idx = 0;
=== modified file 'src/doc.c'
--- src/doc.c 2011-07-15 15:31:36 +0000
+++ src/doc.c 2011-07-28 21:34:39 +0000
@@ -39,7 +39,7 @@
extern Lisp_Object Qclosure;
/* Buffer used for reading from documentation file. */
static char *get_doc_string_buffer;
-static int get_doc_string_buffer_size;
+static ptrdiff_t get_doc_string_buffer_size;
static unsigned char *read_bytecode_pointer;
static Lisp_Object Fdocumentation_property (Lisp_Object, Lisp_Object,
@@ -166,18 +166,23 @@
p = get_doc_string_buffer;
while (1)
{
- EMACS_INT space_left = (get_doc_string_buffer_size
+ ptrdiff_t space_left = (get_doc_string_buffer_size
- (p - get_doc_string_buffer));
int nread;
/* Allocate or grow the buffer if we need to. */
if (space_left == 0)
{
- EMACS_INT in_buffer = p - get_doc_string_buffer;
- get_doc_string_buffer_size += 16 * 1024;
+ ptrdiff_t in_buffer = p - get_doc_string_buffer;
+ enum { incr = 16 * 1024 };
+ ptrdiff_t size;
+ if (min (PTRDIFF_MAX, SIZE_MAX) - 1 - incr
+ < get_doc_string_buffer_size)
+ memory_full (SIZE_MAX);
+ size = get_doc_string_buffer_size + incr;
get_doc_string_buffer
- = (char *) xrealloc (get_doc_string_buffer,
- get_doc_string_buffer_size + 1);
+ = (char *) xrealloc (get_doc_string_buffer, size + 1);
+ get_doc_string_buffer_size = size;
p = get_doc_string_buffer + in_buffer;
space_left = (get_doc_string_buffer_size
- (p - get_doc_string_buffer));
@@ -713,16 +718,16 @@
int changed = 0;
register unsigned char *strp;
register char *bufp;
- EMACS_INT idx;
- EMACS_INT bsize;
+ ptrdiff_t idx;
+ ptrdiff_t bsize;
Lisp_Object tem;
Lisp_Object keymap;
unsigned char *start;
- EMACS_INT length, length_byte;
+ ptrdiff_t length, length_byte;
Lisp_Object name;
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
int multibyte;
- EMACS_INT nchars;
+ ptrdiff_t nchars;
if (NILP (string))
return Qnil;
@@ -774,7 +779,7 @@
}
else if (strp[0] == '\\' && strp[1] == '[')
{
- EMACS_INT start_idx;
+ ptrdiff_t start_idx;
int follow_remap = 1;
changed = 1;
@@ -813,7 +818,9 @@
if (NILP (tem)) /* but not on any keys */
{
- EMACS_INT offset = bufp - buf;
+ ptrdiff_t offset = bufp - buf;
+ if (STRING_BYTES_BOUND - 4 < bsize)
+ string_overflow ();
buf = (char *) xrealloc (buf, bsize += 4);
bufp = buf + offset;
memcpy (bufp, "M-x ", 4);
@@ -836,7 +843,7 @@
else if (strp[0] == '\\' && (strp[1] == '{' || strp[1] == '<'))
{
struct buffer *oldbuf;
- EMACS_INT start_idx;
+ ptrdiff_t start_idx;
/* This is for computing the SHADOWS arg for describe_map_tree. */
Lisp_Object active_maps = Fcurrent_active_maps (Qnil, Qnil);
Lisp_Object earlier_maps;
@@ -907,7 +914,9 @@
length_byte = SBYTES (tem);
subst:
{
- EMACS_INT offset = bufp - buf;
+ ptrdiff_t offset = bufp - buf;
+ if (STRING_BYTES_BOUND - length_byte < bsize)
+ string_overflow ();
buf = (char *) xrealloc (buf, bsize += length_byte);
bufp = buf + offset;
memcpy (bufp, start, length_byte);
=== modified file 'src/editfns.c'
--- src/editfns.c 2011-07-28 00:15:43 +0000
+++ src/editfns.c 2011-07-29 05:31:12 +0000
@@ -2100,7 +2100,7 @@
void
set_time_zone_rule (const char *tzstring)
{
- int envptrs;
+ ptrdiff_t envptrs;
char **from, **to, **newenv;
/* Make the ENVIRON vector longer with room for TZSTRING. */
@@ -3350,7 +3350,7 @@
static char *message_text;
/* Allocated length of that buffer. */
-static int message_length;
+static ptrdiff_t message_length;
DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
doc: /* Display a message at the bottom of the screen.
@@ -3432,8 +3432,8 @@
}
if (SBYTES (val) > message_length)
{
+ message_text = (char *) xrealloc (message_text, SBYTES (val));
message_length = SBYTES (val);
- message_text = (char *)xrealloc (message_text, message_length);
}
memcpy (message_text, SDATA (val), SBYTES (val));
message2 (message_text, SBYTES (val),
@@ -4158,7 +4158,7 @@
character. CONVBYTES says how much room is needed. Allocate
enough room (and then some) and do it again. */
{
- EMACS_INT used = p - buf;
+ ptrdiff_t used = p - buf;
if (max_bufsize - used < convbytes)
string_overflow ();
=== modified file 'src/emacs.c'
--- src/emacs.c 2011-07-11 06:05:57 +0000
+++ src/emacs.c 2011-07-28 21:38:23 +0000
@@ -1360,9 +1360,12 @@
This requires inserting a new element into argv. */
if (displayname != 0 && skip_args - count_before == 1)
{
- char **new = (char **) xmalloc (sizeof (char *) * (argc + 2));
+ char **new;
int j;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (char *) - 2 < argc)
+ memory_full (SIZE_MAX);
+ new = (char **) xmalloc (sizeof *new * argc + sizeof *new * 2);
for (j = 0; j < count_before + 1; j++)
new[j] = argv[j];
new[count_before + 1] = (char *) "-d";
@@ -1838,13 +1841,19 @@
0 for an option that takes no arguments,
1 for an option that takes one argument, etc.
-1 for an ordinary non-option argument. */
- int *options = (int *) xmalloc (sizeof (int) * argc);
- int *priority = (int *) xmalloc (sizeof (int) * argc);
+ int *options;
+ int *priority;
int to = 1;
int incoming_used = 1;
int from;
int i;
+ if (sizeof (char *) < sizeof (int)
+ && min (PTRDIFF_MAX, SIZE_MAX) / sizeof (int) < argc)
+ memory_full (SIZE_MAX);
+ options = (int *) xmalloc (sizeof (int) * argc);
+ priority = (int *) xmalloc (sizeof (int) * argc);
+
/* Categorize all the options,
and figure out which argv elts are option arguments. */
for (from = 1; from < argc; from++)
=== modified file 'src/eval.c'
--- src/eval.c 2011-07-07 02:14:52 +0000
+++ src/eval.c 2011-07-28 21:42:59 +0000
@@ -133,8 +133,9 @@
void
init_eval_once (void)
{
- specpdl_size = 50;
- specpdl = (struct specbinding *) xmalloc (specpdl_size * sizeof (struct
specbinding));
+ enum { size = 50 };
+ specpdl = (struct specbinding *) xmalloc (size * sizeof (struct
specbinding));
+ specpdl_size = size;
specpdl_ptr = specpdl;
/* Don't forget to update docs (lispref node "Local Variables"). */
max_specpdl_size = 1300; /* 1000 is not enough for CEDET's c-by.el. */
@@ -192,7 +193,7 @@
if (lisp_eval_depth + 40 > max_lisp_eval_depth)
max_lisp_eval_depth = lisp_eval_depth + 40;
- if (SPECPDL_INDEX () + 100 > max_specpdl_size)
+ if (max_specpdl_size - 100 < SPECPDL_INDEX ())
max_specpdl_size = SPECPDL_INDEX () + 100;
#ifdef HAVE_WINDOW_SYSTEM
@@ -3274,17 +3275,22 @@
grow_specpdl (void)
{
register int count = SPECPDL_INDEX ();
- if (specpdl_size >= max_specpdl_size)
+ int max_size =
+ min (max_specpdl_size,
+ min (max (PTRDIFF_MAX, SIZE_MAX) / sizeof (struct specbinding),
+ INT_MAX));
+ int size;
+ if (max_size <= specpdl_size)
{
if (max_specpdl_size < 400)
- max_specpdl_size = 400;
- if (specpdl_size >= max_specpdl_size)
+ max_size = max_specpdl_size = 400;
+ if (max_size <= specpdl_size)
signal_error ("Variable binding depth exceeds max-specpdl-size", Qnil);
}
- specpdl_size *= 2;
- if (specpdl_size > max_specpdl_size)
- specpdl_size = max_specpdl_size;
- specpdl = (struct specbinding *) xrealloc (specpdl, specpdl_size * sizeof
(struct specbinding));
+ size = specpdl_size < max_size / 2 ? 2 * specpdl_size : max_size;
+ specpdl = ((struct specbinding *)
+ xrealloc (specpdl, size * sizeof (struct specbinding)));
+ specpdl_size = size;
specpdl_ptr = specpdl + count;
}
=== modified file 'src/fileio.c'
--- src/fileio.c 2011-07-19 20:33:28 +0000
+++ src/fileio.c 2011-07-19 20:37:27 +0000
@@ -2912,7 +2912,7 @@
encoded_absname = ENCODE_FILE (absname);
- if (chmod (SSDATA (encoded_absname), XINT (mode)) < 0)
+ if (chmod (SSDATA (encoded_absname), XINT (mode) & 07777) < 0)
report_file_error ("Doing chmod", Fcons (absname, Qnil));
return Qnil;
@@ -5114,11 +5114,11 @@
{
if (stat (SSDATA (BVAR (current_buffer, filename)), &st) >= 0)
/* But make sure we can overwrite it later! */
- auto_save_mode_bits = st.st_mode | 0600;
+ auto_save_mode_bits = (st.st_mode | 0600) & 0777;
else if ((modes = Ffile_modes (BVAR (current_buffer, filename)),
INTEGERP (modes)))
/* Remote files don't cooperate with stat. */
- auto_save_mode_bits = XINT (modes) | 0600;
+ auto_save_mode_bits = (XINT (modes) | 0600) & 0777;
}
return
=== modified file 'src/fns.c'
--- src/fns.c 2011-07-08 00:51:25 +0000
+++ src/fns.c 2011-07-28 21:31:33 +0000
@@ -602,7 +602,12 @@
prev = Qnil;
if (STRINGP (val))
- SAFE_ALLOCA (textprops, struct textprop_rec *, sizeof (struct
textprop_rec) * nargs);
+ {
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *textprops < nargs)
+ memory_full (SIZE_MAX);
+ SAFE_ALLOCA (textprops, struct textprop_rec *,
+ sizeof *textprops * nargs);
+ }
for (argnum = 0; argnum < nargs; argnum++)
{
@@ -3395,11 +3400,13 @@
/* Value is the next integer I >= N, N >= 0 which is "almost" a prime
- number. */
+ number. A number is "almost" a prime number if it is not divisible
+ by any integer in the range 2 .. (NEXT_ALMOST_PRIME_LIMIT - 1). */
EMACS_INT
next_almost_prime (EMACS_INT n)
{
+ verify (NEXT_ALMOST_PRIME_LIMIT == 11);
for (n |= 1; ; n += 2)
if (n % 3 != 0 && n % 5 != 0 && n % 7 != 0)
return n;
@@ -3787,11 +3794,11 @@
the hash code of KEY. Value is the index of the entry in H
matching KEY, or -1 if not found. */
-EMACS_INT
+ptrdiff_t
hash_lookup (struct Lisp_Hash_Table *h, Lisp_Object key, EMACS_UINT *hash)
{
EMACS_UINT hash_code;
- EMACS_INT start_of_bucket;
+ ptrdiff_t start_of_bucket;
Lisp_Object idx;
hash_code = h->hashfn (h, key);
@@ -3821,11 +3828,11 @@
HASH is a previously computed hash code of KEY.
Value is the index of the entry in H matching KEY. */
-EMACS_INT
+ptrdiff_t
hash_put (struct Lisp_Hash_Table *h, Lisp_Object key, Lisp_Object value,
EMACS_UINT hash)
{
- EMACS_INT start_of_bucket, i;
+ ptrdiff_t start_of_bucket, i;
xassert ((hash & ~INTMASK) == 0);
@@ -4482,7 +4489,7 @@
(Lisp_Object key, Lisp_Object table, Lisp_Object dflt)
{
struct Lisp_Hash_Table *h = check_hash_table (table);
- EMACS_INT i = hash_lookup (h, key, NULL);
+ ptrdiff_t i = hash_lookup (h, key, NULL);
return i >= 0 ? HASH_VALUE (h, i) : dflt;
}
@@ -4494,7 +4501,7 @@
(Lisp_Object key, Lisp_Object value, Lisp_Object table)
{
struct Lisp_Hash_Table *h = check_hash_table (table);
- EMACS_INT i;
+ ptrdiff_t i;
EMACS_UINT hash;
i = hash_lookup (h, key, &hash);
=== modified file 'src/frame.c'
--- src/frame.c 2011-07-22 05:02:24 +0000
+++ src/frame.c 2011-07-29 05:31:12 +0000
@@ -160,7 +160,7 @@
if (FRAME_MINIBUF_ONLY_P (f))
return;
- if (INTEGERP (value))
+ if (TYPE_RANGED_INTEGERP (int, value))
nlines = XINT (value);
else
nlines = 0;
@@ -2992,7 +2992,7 @@
f->size_hint_flags &= ~ (XNegative | YNegative);
if (EQ (left, Qminus))
f->size_hint_flags |= XNegative;
- else if (INTEGERP (left))
+ else if (TYPE_RANGED_INTEGERP (int, left))
{
leftpos = XINT (left);
if (leftpos < 0)
@@ -3000,21 +3000,21 @@
}
else if (CONSP (left) && EQ (XCAR (left), Qminus)
&& CONSP (XCDR (left))
- && INTEGERP (XCAR (XCDR (left))))
+ && RANGED_INTEGERP (-INT_MAX, XCAR (XCDR (left)), INT_MAX))
{
leftpos = - XINT (XCAR (XCDR (left)));
f->size_hint_flags |= XNegative;
}
else if (CONSP (left) && EQ (XCAR (left), Qplus)
&& CONSP (XCDR (left))
- && INTEGERP (XCAR (XCDR (left))))
+ && TYPE_RANGED_INTEGERP (int, XCAR (XCDR (left))))
{
leftpos = XINT (XCAR (XCDR (left)));
}
if (EQ (top, Qminus))
f->size_hint_flags |= YNegative;
- else if (INTEGERP (top))
+ else if (TYPE_RANGED_INTEGERP (int, top))
{
toppos = XINT (top);
if (toppos < 0)
@@ -3022,14 +3022,14 @@
}
else if (CONSP (top) && EQ (XCAR (top), Qminus)
&& CONSP (XCDR (top))
- && INTEGERP (XCAR (XCDR (top))))
+ && RANGED_INTEGERP (-INT_MAX, XCAR (XCDR (top)), INT_MAX))
{
toppos = - XINT (XCAR (XCDR (top)));
f->size_hint_flags |= YNegative;
}
else if (CONSP (top) && EQ (XCAR (top), Qplus)
&& CONSP (XCDR (top))
- && INTEGERP (XCAR (XCDR (top))))
+ && TYPE_RANGED_INTEGERP (int, XCAR (XCDR (top))))
{
toppos = XINT (XCAR (XCDR (top)));
}
@@ -3481,7 +3481,7 @@
x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
do_pending_window_change (0);
}
- else if (INTEGERP (arg) && XINT (arg) > 0
+ else if (RANGED_INTEGERP (1, arg, INT_MAX)
&& XFASTINT (arg) != FRAME_CONFIG_SCROLL_BAR_WIDTH (f))
{
if (XFASTINT (arg) <= 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM)
@@ -3520,7 +3520,7 @@
{
double alpha = 1.0;
double newval[2];
- int i, ialpha;
+ int i;
Lisp_Object item;
for (i = 0; i < 2; i++)
@@ -3544,7 +3544,7 @@
}
else if (INTEGERP (item))
{
- ialpha = XINT (item);
+ EMACS_INT ialpha = XINT (item);
if (ialpha < 0 || 100 < ialpha)
args_out_of_range (make_number (0), make_number (100));
else
@@ -4031,11 +4031,15 @@
if (!EQ (tem0, Qunbound))
{
CHECK_NUMBER (tem0);
+ if (! (0 <= XINT (tem0) && XINT (tem0) <= INT_MAX))
+ xsignal1 (Qargs_out_of_range, tem0);
FRAME_LINES (f) = XINT (tem0);
}
if (!EQ (tem1, Qunbound))
{
CHECK_NUMBER (tem1);
+ if (! (0 <= XINT (tem1) && XINT (tem1) <= INT_MAX))
+ xsignal1 (Qargs_out_of_range, tem1);
SET_FRAME_COLS (f, XINT (tem1));
}
if (!NILP (tem2) && !EQ (tem2, Qunbound))
@@ -4066,12 +4070,10 @@
? tool_bar_button_relief
: DEFAULT_TOOL_BAR_BUTTON_RELIEF);
- if (INTEGERP (Vtool_bar_button_margin)
- && XINT (Vtool_bar_button_margin) > 0)
+ if (RANGED_INTEGERP (1, Vtool_bar_button_margin, INT_MAX))
margin = XFASTINT (Vtool_bar_button_margin);
else if (CONSP (Vtool_bar_button_margin)
- && INTEGERP (XCDR (Vtool_bar_button_margin))
- && XINT (XCDR (Vtool_bar_button_margin)) > 0)
+ && RANGED_INTEGERP (1, XCDR (Vtool_bar_button_margin), INT_MAX))
margin = XFASTINT (XCDR (Vtool_bar_button_margin));
else
margin = 0;
@@ -4097,14 +4099,14 @@
}
else if (CONSP (tem0) && EQ (XCAR (tem0), Qminus)
&& CONSP (XCDR (tem0))
- && INTEGERP (XCAR (XCDR (tem0))))
+ && RANGED_INTEGERP (-INT_MAX, XCAR (XCDR (tem0)), INT_MAX))
{
f->top_pos = - XINT (XCAR (XCDR (tem0)));
window_prompting |= YNegative;
}
else if (CONSP (tem0) && EQ (XCAR (tem0), Qplus)
&& CONSP (XCDR (tem0))
- && INTEGERP (XCAR (XCDR (tem0))))
+ && TYPE_RANGED_INTEGERP (int, XCAR (XCDR (tem0))))
{
f->top_pos = XINT (XCAR (XCDR (tem0)));
}
@@ -4125,14 +4127,14 @@
}
else if (CONSP (tem1) && EQ (XCAR (tem1), Qminus)
&& CONSP (XCDR (tem1))
- && INTEGERP (XCAR (XCDR (tem1))))
+ && RANGED_INTEGERP (-INT_MAX, XCAR (XCDR (tem1)), INT_MAX))
{
f->left_pos = - XINT (XCAR (XCDR (tem1)));
window_prompting |= XNegative;
}
else if (CONSP (tem1) && EQ (XCAR (tem1), Qplus)
&& CONSP (XCDR (tem1))
- && INTEGERP (XCAR (XCDR (tem1))))
+ && TYPE_RANGED_INTEGERP (int, XCAR (XCDR (tem1))))
{
f->left_pos = XINT (XCAR (XCDR (tem1)));
}
=== modified file 'src/frame.h'
--- src/frame.h 2011-06-11 21:31:32 +0000
+++ src/frame.h 2011-07-28 21:51:29 +0000
@@ -258,11 +258,11 @@
/* Size of this frame, excluding fringes, scroll bars etc.,
in units of canonical characters. */
- EMACS_INT text_lines, text_cols;
+ int text_lines, text_cols;
/* Total size of this frame (i.e. its native window), in units of
canonical characters. */
- EMACS_INT total_lines, total_cols;
+ int total_lines, total_cols;
/* New text height and width for pending size change.
0 if no change pending. */
=== modified file 'src/fringe.c'
--- src/fringe.c 2011-06-24 21:25:22 +0000
+++ src/fringe.c 2011-07-28 23:47:01 +0000
@@ -1610,22 +1610,25 @@
if (n == max_fringe_bitmaps)
{
- if ((max_fringe_bitmaps + 20) > MAX_FRINGE_BITMAPS)
+ int bitmaps = max_fringe_bitmaps + 20;
+ if (MAX_FRINGE_BITMAPS < bitmaps)
error ("No free fringe bitmap slots");
i = max_fringe_bitmaps;
- max_fringe_bitmaps += 20;
fringe_bitmaps
= ((struct fringe_bitmap **)
- xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof
(struct fringe_bitmap *)));
+ xrealloc (fringe_bitmaps, bitmaps * sizeof *fringe_bitmaps));
fringe_faces
- = (Lisp_Object *) xrealloc (fringe_faces, max_fringe_bitmaps *
sizeof (Lisp_Object));
+ = (Lisp_Object *) xrealloc (fringe_faces,
+ bitmaps * sizeof *fringe_faces);
- for (; i < max_fringe_bitmaps; i++)
+ for (i = max_fringe_bitmaps; i < bitmaps; i++)
{
fringe_bitmaps[i] = NULL;
fringe_faces[i] = Qnil;
}
+
+ max_fringe_bitmaps = bitmaps;
}
}
=== modified file 'src/ftfont.c'
--- src/ftfont.c 2011-06-18 18:09:17 +0000
+++ src/ftfont.c 2011-07-28 23:51:50 +0000
@@ -682,7 +682,10 @@
if (NILP (val))
continue;
len = Flength (val);
- spec->features[i] = malloc (sizeof (int) * XINT (len));
+ spec->features[i] =
+ (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (int) < XINT (len)
+ ? 0
+ : malloc (sizeof (int) * XINT (len)));
if (! spec->features[i])
{
if (i > 0 && spec->features[0])
@@ -1761,6 +1764,9 @@
static void
setup_otf_gstring (int size)
{
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (OTF_Glyph) < size)
+ memory_full (SIZE_MAX);
+
if (otf_gstring.size == 0)
{
otf_gstring.glyphs = (OTF_Glyph *) xmalloc (sizeof (OTF_Glyph) * size);
@@ -2390,6 +2396,8 @@
struct MFLTFontFT flt_font_ft;
MFLT *flt = NULL;
int with_variation_selector = 0;
+ int allocated_max = min (INT_MAX,
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof (MFLTGlyph));
if (! m17n_flt_initialized)
{
@@ -2445,6 +2453,9 @@
}
}
+ if (allocated_max / 2 < len)
+ memory_full (SIZE_MAX);
+
if (gstring.allocated == 0)
{
gstring.allocated = len * 2;
@@ -2504,6 +2515,8 @@
int result = mflt_run (&gstring, 0, len, &flt_font_ft.flt_font, flt);
if (result != -2)
break;
+ if (allocated_max / 2 < gstring.allocated)
+ memory_full (SIZE_MAX);
gstring.allocated += gstring.allocated;
gstring.glyphs = xrealloc (gstring.glyphs,
sizeof (MFLTGlyph) * gstring.allocated);
=== modified file 'src/gtkutil.c'
--- src/gtkutil.c 2011-07-13 15:42:12 +0000
+++ src/gtkutil.c 2011-07-28 23:58:05 +0000
@@ -487,7 +487,8 @@
if (!utf8_str)
{
/* Probably some control characters in str. Escape them. */
- size_t nr_bad = 0;
+ ptrdiff_t len;
+ ptrdiff_t nr_bad = 0;
gsize bytes_read;
gsize bytes_written;
unsigned char *p = (unsigned char *)str;
@@ -511,7 +512,10 @@
}
if (cp) g_free (cp);
- up = utf8_str = xmalloc (strlen (str) + nr_bad * 4 + 1);
+ len = strlen (str);
+ if ((min (PTRDIFF_MAX, SIZE_MAX) - len - 1) / 4 < nr_bad)
+ memory_full (SIZE_MAX);
+ up = utf8_str = xmalloc (len + nr_bad * 4 + 1);
p = (unsigned char *)str;
while (! (cp = g_locale_to_utf8 ((char *)p, -1, &bytes_read,
@@ -3296,8 +3300,8 @@
static struct
{
GtkWidget **widgets;
- int max_size;
- int used;
+ ptrdiff_t max_size;
+ ptrdiff_t used;
} id_to_widget;
/* Grow this much every time we need to allocate more */
@@ -3306,15 +3310,20 @@
/* Store the widget pointer W in id_to_widget and return the integer index. */
-static int
+static ptrdiff_t
xg_store_widget_in_map (GtkWidget *w)
{
- int i;
+ ptrdiff_t i;
if (id_to_widget.max_size == id_to_widget.used)
{
- int new_size = id_to_widget.max_size + ID_TO_WIDGET_INCR;
+ ptrdiff_t new_size;
+ ptrdiff_t lim = min (TYPE_MAXIMUM (Window),
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof (GtkWidget *));
+ if (lim - ID_TO_WIDGET_INCR < id_to_widget.max_size)
+ memory_full (SIZE_MAX);
+ new_size = id_to_widget.max_size + ID_TO_WIDGET_INCR;
id_to_widget.widgets = xrealloc (id_to_widget.widgets,
sizeof (GtkWidget *)*new_size);
@@ -3345,7 +3354,7 @@
Called when scroll bar is destroyed. */
static void
-xg_remove_widget_from_map (int idx)
+xg_remove_widget_from_map (ptrdiff_t idx)
{
if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0)
{
@@ -3357,7 +3366,7 @@
/* Get the widget pointer at IDX from id_to_widget. */
static GtkWidget *
-xg_get_widget_from_map (int idx)
+xg_get_widget_from_map (ptrdiff_t idx)
{
if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0)
return id_to_widget.widgets[idx];
@@ -3396,10 +3405,10 @@
/* Return the scrollbar id for X Window WID on display DPY.
Return -1 if WID not in id_to_widget. */
-int
+ptrdiff_t
xg_get_scroll_id_for_window (Display *dpy, Window wid)
{
- int idx;
+ ptrdiff_t idx;
GtkWidget *w;
w = xg_win_to_widget (dpy, wid);
@@ -3421,7 +3430,7 @@
static void
xg_gtk_scroll_destroy (GtkWidget *widget, gpointer data)
{
- int id = (intptr_t) data;
+ intptr_t id = (intptr_t) data;
xg_remove_widget_from_map (id);
}
@@ -3496,7 +3505,7 @@
/* Remove the scroll bar represented by SCROLLBAR_ID from the frame F. */
void
-xg_remove_scroll_bar (FRAME_PTR f, int scrollbar_id)
+xg_remove_scroll_bar (FRAME_PTR f, ptrdiff_t scrollbar_id)
{
GtkWidget *w = xg_get_widget_from_map (scrollbar_id);
if (w)
@@ -3515,7 +3524,7 @@
void
xg_update_scrollbar_pos (FRAME_PTR f,
- int scrollbar_id,
+ ptrdiff_t scrollbar_id,
int top,
int left,
int width,
@@ -4429,7 +4438,7 @@
int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
int idx;
- int img_id;
+ ptrdiff_t img_id;
int icon_size = 0;
struct image *img = NULL;
Lisp_Object image;
=== modified file 'src/gtkutil.h'
--- src/gtkutil.h 2011-06-14 21:08:20 +0000
+++ src/gtkutil.h 2011-07-28 23:58:05 +0000
@@ -114,17 +114,17 @@
extern int xg_have_tear_offs (void);
-extern int xg_get_scroll_id_for_window (Display *dpy, Window wid);
+extern ptrdiff_t xg_get_scroll_id_for_window (Display *dpy, Window wid);
extern void xg_create_scroll_bar (FRAME_PTR f,
struct scroll_bar *bar,
GCallback scroll_callback,
GCallback end_callback,
const char *scroll_bar_name);
-extern void xg_remove_scroll_bar (FRAME_PTR f, int scrollbar_id);
+extern void xg_remove_scroll_bar (FRAME_PTR f, ptrdiff_t scrollbar_id);
extern void xg_update_scrollbar_pos (FRAME_PTR f,
- int scrollbar_id,
+ ptrdiff_t scrollbar_id,
int top,
int left,
int width,
@@ -185,4 +185,3 @@
#endif /* USE_GTK */
#endif /* GTKUTIL_H */
-
=== modified file 'src/image.c'
--- src/image.c 2011-07-28 09:40:05 +0000
+++ src/image.c 2011-07-29 05:31:12 +0000
@@ -196,7 +196,7 @@
int
x_bitmap_pixmap (FRAME_PTR f, ptrdiff_t id)
{
- return (int) FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap;
+ return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap;
}
#endif
@@ -218,9 +218,9 @@
if (dpyinfo->bitmaps == NULL)
{
+ dpyinfo->bitmaps
+ = (Bitmap_Record *) xmalloc (10 * sizeof (Bitmap_Record));
dpyinfo->bitmaps_size = 10;
- dpyinfo->bitmaps
- = (Bitmap_Record *) xmalloc (dpyinfo->bitmaps_size * sizeof
(Bitmap_Record));
dpyinfo->bitmaps_last = 1;
return 1;
}
@@ -235,17 +235,18 @@
if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (Bitmap_Record) / 2
< dpyinfo->bitmaps_size)
memory_full (SIZE_MAX);
- dpyinfo->bitmaps_size *= 2;
dpyinfo->bitmaps
= (Bitmap_Record *) xrealloc (dpyinfo->bitmaps,
- dpyinfo->bitmaps_size * sizeof
(Bitmap_Record));
+ (dpyinfo->bitmaps_size
+ * (2 * sizeof (Bitmap_Record))));
+ dpyinfo->bitmaps_size *= 2;
return ++dpyinfo->bitmaps_last;
}
/* Add one reference to the reference count of the bitmap with id ID. */
void
-x_reference_bitmap (FRAME_PTR f, int id)
+x_reference_bitmap (FRAME_PTR f, ptrdiff_t id)
{
++FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].refcount;
}
@@ -807,29 +808,30 @@
break;
case IMAGE_POSITIVE_INTEGER_VALUE:
- if (!INTEGERP (value) || XINT (value) <= 0)
+ if (! RANGED_INTEGERP (1, value, INT_MAX))
return 0;
break;
case IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR:
- if (INTEGERP (value) && XINT (value) >= 0)
+ if (RANGED_INTEGERP (1, value, INT_MAX))
break;
if (CONSP (value)
- && INTEGERP (XCAR (value)) && INTEGERP (XCDR (value))
- && XINT (XCAR (value)) >= 0 && XINT (XCDR (value)) >= 0)
+ && RANGED_INTEGERP (1, XCAR (value), INT_MAX)
+ && RANGED_INTEGERP (1, XCDR (value), INT_MAX))
break;
return 0;
case IMAGE_ASCENT_VALUE:
if (SYMBOLP (value) && EQ (value, Qcenter))
break;
- else if (INTEGERP (value)
- && XINT (value) >= 0
- && XINT (value) <= 100)
+ else if (RANGED_INTEGERP (0, value, 100))
break;
return 0;
case IMAGE_NON_NEGATIVE_INTEGER_VALUE:
+ /* Unlike the other integer-related cases, this one does not
+ verify that VALUE fits in 'int'. This is because callers
+ want EMACS_INT. */
if (!INTEGERP (value) || XINT (value) < 0)
return 0;
break;
@@ -849,7 +851,7 @@
break;
case IMAGE_INTEGER_VALUE:
- if (!INTEGERP (value))
+ if (! TYPE_RANGED_INTEGERP (int, value))
return 0;
break;
@@ -919,7 +921,7 @@
if (valid_image_p (spec))
{
struct frame *f = check_x_frame (frame);
- int id = lookup_image (f, spec);
+ ptrdiff_t id = lookup_image (f, spec);
struct image *img = IMAGE_FROM_ID (f, id);
int width = img->width + 2 * img->hmargin;
int height = img->height + 2 * img->vmargin;
@@ -949,7 +951,7 @@
if (valid_image_p (spec))
{
struct frame *f = check_x_frame (frame);
- int id = lookup_image (f, spec);
+ ptrdiff_t id = lookup_image (f, spec);
struct image *img = IMAGE_FROM_ID (f, id);
if (img->mask)
mask = Qt;
@@ -972,7 +974,7 @@
if (valid_image_p (spec))
{
struct frame *f = check_x_frame (frame);
- int id = lookup_image (f, spec);
+ ptrdiff_t id = lookup_image (f, spec);
struct image *img = IMAGE_FROM_ID (f, id);
ext = img->lisp_data;
}
@@ -1121,7 +1123,7 @@
ascent = height / 2;
}
else
- ascent = (int) (height * img->ascent / 100.0);
+ ascent = height * (img->ascent / 100.0);
return ascent;
}
@@ -1367,11 +1369,12 @@
{
/* This isn't called frequently so we get away with simply
reallocating the color vector to the needed size, here. */
- ++img->ncolors;
+ ptrdiff_t ncolors = img->ncolors + 1;
img->colors =
(unsigned long *) xrealloc (img->colors,
- img->ncolors * sizeof *img->colors);
- img->colors[img->ncolors - 1] = color.pixel;
+ ncolors * sizeof *img->colors);
+ img->colors[ncolors - 1] = color.pixel;
+ img->ncolors = ncolors;
result = color.pixel;
}
else
@@ -1399,8 +1402,9 @@
int size;
memset (c, 0, sizeof *c);
- c->size = 50;
- c->images = (struct image **) xmalloc (c->size * sizeof *c->images);
+ size = 50;
+ c->images = (struct image **) xmalloc (size * sizeof *c->images);
+ c->size = size;
size = IMAGE_CACHE_BUCKETS_SIZE * sizeof *c->buckets;
c->buckets = (struct image **) xmalloc (size);
memset (c->buckets, 0, size);
@@ -1466,7 +1470,7 @@
struct image_cache *c = FRAME_IMAGE_CACHE (f);
if (c)
{
- int i;
+ ptrdiff_t i;
/* Cache should not be referenced by any frame when freed. */
xassert (c->refcount == 0);
@@ -1496,7 +1500,7 @@
if (c)
{
- int i, nfreed = 0;
+ ptrdiff_t i, nfreed = 0;
/* Block input so that we won't be interrupted by a SIGIO
while being in an inconsistent state. */
@@ -1520,8 +1524,8 @@
{
/* Free cache based on timestamp. */
EMACS_TIME t;
- time_t old;
- int delay, nimages = 0;
+ double old, delay;
+ ptrdiff_t nimages = 0;
for (i = 0; i < c->used; ++i)
if (c->images[i])
@@ -1529,9 +1533,10 @@
/* If the number of cached images has grown unusually large,
decrease the cache eviction delay (Bug#6230). */
- delay = XFASTINT (Vimage_cache_eviction_delay);
+ delay = XINT (Vimage_cache_eviction_delay);
if (nimages > 40)
- delay = max (1, 1600 * delay / (nimages*nimages));
+ delay = 1600 * delay / nimages / nimages;
+ delay = max (delay, 1);
EMACS_GET_TIME (t);
old = EMACS_SECS (t) - delay;
@@ -1707,7 +1712,7 @@
/* Return the id of image with Lisp specification SPEC on frame F.
SPEC must be a valid Lisp image specification (see valid_image_p). */
-int
+ptrdiff_t
lookup_image (struct frame *f, Lisp_Object spec)
{
struct image *img;
@@ -1766,15 +1771,12 @@
img->ascent = CENTERED_IMAGE_ASCENT;
margin = image_spec_value (spec, QCmargin, NULL);
- if (INTEGERP (margin) && XINT (margin) >= 0)
+ if (INTEGERP (margin))
img->vmargin = img->hmargin = XFASTINT (margin);
- else if (CONSP (margin) && INTEGERP (XCAR (margin))
- && INTEGERP (XCDR (margin)))
+ else if (CONSP (margin))
{
- if (XINT (XCAR (margin)) > 0)
- img->hmargin = XFASTINT (XCAR (margin));
- if (XINT (XCDR (margin)) > 0)
- img->vmargin = XFASTINT (XCDR (margin));
+ img->hmargin = XFASTINT (XCAR (margin));
+ img->vmargin = XFASTINT (XCDR (margin));
}
relief = image_spec_value (spec, QCrelief, NULL);
@@ -1821,7 +1823,7 @@
cache_image (struct frame *f, struct image *img)
{
struct image_cache *c = FRAME_IMAGE_CACHE (f);
- int i;
+ ptrdiff_t i;
/* Find a free slot in c->images. */
for (i = 0; i < c->used; ++i)
@@ -1833,9 +1835,10 @@
{
if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *c->images / 2 < c->size)
memory_full (SIZE_MAX);
+ c->images =
+ (struct image **) xrealloc (c->images,
+ c->size * (2 * sizeof *c->images));
c->size *= 2;
- c->images = (struct image **) xrealloc (c->images,
- c->size * sizeof *c->images);
}
/* Add IMG to c->images, and assign IMG an id. */
@@ -1875,7 +1878,7 @@
{
if (c)
{
- int i;
+ ptrdiff_t i;
for (i = 0; i < c->used; ++i)
if (c->images[i])
mark_image (c->images[i]);
@@ -2072,7 +2075,7 @@
DWORD err = GetLastError ();
Lisp_Object errcode;
/* All system errors are < 10000, so the following is safe. */
- XSETINT (errcode, (int) err);
+ XSETINT (errcode, err);
image_error ("Unable to create bitmap, error code %d", errcode, Qnil);
x_destroy_x_image (*ximg);
return 0;
@@ -2351,7 +2354,7 @@
else
{
Lisp_Object data;
- EMACS_INT width, height;
+ int width, height;
/* Entries for `:width', `:height' and `:data' must be present. */
if (!kw[XBM_WIDTH].count
@@ -3583,9 +3586,12 @@
#endif /* HAVE_NTGUI */
/* Remember allocated colors. */
- img->ncolors = attrs.nalloc_pixels;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *img->colors
+ < attrs.nalloc_pixels)
+ memory_full (SIZE_MAX);
img->colors = (unsigned long *) xmalloc (img->ncolors
* sizeof *img->colors);
+ img->ncolors = attrs.nalloc_pixels;
for (i = 0; i < attrs.nalloc_pixels; ++i)
{
img->colors[i] = attrs.alloc_pixels[i];
@@ -3809,8 +3815,8 @@
int chars_len)
{
struct Lisp_Hash_Table *table = XHASH_TABLE (color_table);
- int i = hash_lookup (table, make_unibyte_string (chars_start, chars_len),
- NULL);
+ ptrdiff_t i =
+ hash_lookup (table, make_unibyte_string (chars_start, chars_len), NULL);
return i >= 0 ? HASH_VALUE (table, i) : Qnil;
}
@@ -4159,6 +4165,12 @@
/* Number of entries in the color table. */
static int ct_colors_allocated;
+enum
+{
+ ct_colors_allocated_max =
+ min (INT_MAX,
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof (unsigned long))
+};
/* Initialize the color table. */
@@ -4245,7 +4257,14 @@
XColor color;
Colormap cmap;
int rc;
-
+#else
+ COLORREF color;
+#endif
+
+ if (ct_colors_allocated_max <= ct_colors_allocated)
+ return FRAME_FOREGROUND_PIXEL (f);
+
+#ifdef HAVE_X_WINDOWS
color.red = r;
color.green = g;
color.blue = b;
@@ -4267,7 +4286,6 @@
return FRAME_FOREGROUND_PIXEL (f);
#else
- COLORREF color;
#ifdef HAVE_NTGUI
color = PALETTERGB (r, g, b);
#else
@@ -4308,6 +4326,9 @@
Colormap cmap;
int rc;
+ if (ct_colors_allocated_max <= ct_colors_allocated)
+ return FRAME_FOREGROUND_PIXEL (f);
+
#ifdef HAVE_X_WINDOWS
cmap = FRAME_X_COLORMAP (f);
color.pixel = pixel;
@@ -4446,7 +4467,9 @@
HGDIOBJ prev;
#endif /* HAVE_NTGUI */
- colors = (XColor *) xmalloc (img->width * img->height * sizeof *colors);
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *colors / img->width < img->height)
+ memory_full (SIZE_MAX);
+ colors = (XColor *) xmalloc (sizeof *colors * img->width * img->height);
#ifndef HAVE_NTGUI
/* Get the X image IMG->pixmap. */
@@ -4598,7 +4621,9 @@
#define COLOR(A, X, Y) ((A) + (Y) * img->width + (X))
- new = (XColor *) xmalloc (img->width * img->height * sizeof *new);
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *new / img->width < img->height)
+ memory_full (SIZE_MAX);
+ new = (XColor *) xmalloc (sizeof *new * img->width * img->height);
for (y = 0; y < img->height; ++y)
{
@@ -5876,7 +5901,7 @@
for (x = 0; x < width; ++x)
{
- unsigned r, g, b;
+ int r, g, b;
r = *p++ << 8;
g = *p++ << 8;
@@ -6741,17 +6766,29 @@
}
+static void tiff_handler (const char *, const char *, const char *, va_list)
+ ATTRIBUTE_FORMAT_PRINTF (3, 0);
+static void
+tiff_handler (const char *log_format, const char *title,
+ const char *format, va_list ap)
+{
+ /* doprnt is not suitable here, as TIFF handlers are called from
+ libtiff and are passed arbitrary printf directives. Instead, use
+ vsnprintf, taking care to be portable to nonstandard environments
+ where vsnprintf returns -1 on buffer overflow. Since it's just a
+ log entry, it's OK to truncate it. */
+ char buf[4000];
+ int len = vsnprintf (buf, sizeof buf, format, ap);
+ add_to_log (log_format, build_string (title),
+ make_string (buf, max (0, min (len, sizeof buf - 1))));
+}
+
static void tiff_error_handler (const char *, const char *, va_list)
ATTRIBUTE_FORMAT_PRINTF (2, 0);
static void
tiff_error_handler (const char *title, const char *format, va_list ap)
{
- char buf[512];
- int len;
-
- len = sprintf (buf, "TIFF error: %s ", title);
- vsprintf (buf + len, format, ap);
- add_to_log (buf, Qnil, Qnil);
+ tiff_handler ("TIFF error: %s %s", title, format, ap);
}
@@ -6760,12 +6797,7 @@
static void
tiff_warning_handler (const char *title, const char *format, va_list ap)
{
- char buf[512];
- int len;
-
- len = sprintf (buf, "TIFF warning: %s ", title);
- vsprintf (buf + len, format, ap);
- add_to_log (buf, Qnil, Qnil);
+ tiff_handler ("TIFF warning: %s %s", title, format, ap);
}
@@ -6841,8 +6873,9 @@
image = image_spec_value (img->spec, QCindex, NULL);
if (INTEGERP (image))
{
- int ino = XFASTINT (image);
- if (!fn_TIFFSetDirectory (tiff, ino))
+ EMACS_INT ino = XFASTINT (image);
+ if (! (TYPE_MINIMUM (tdir_t) <= ino && ino <= TYPE_MAXIMUM (tdir_t)
+ && fn_TIFFSetDirectory (tiff, ino)))
{
image_error ("Invalid image number `%s' in image `%s'",
image, img->spec);
@@ -7141,7 +7174,7 @@
Lisp_Object specified_file = image_spec_value (img->spec, QCfile, NULL);
Lisp_Object specified_data = image_spec_value (img->spec, QCdata, NULL);
unsigned long bgcolor = 0;
- int idx;
+ EMACS_INT idx;
if (NILP (specified_data))
{
@@ -7371,7 +7404,7 @@
img->lisp_data = Qnil;
if (gif->SavedImages[idx].ExtensionBlockCount > 0)
{
- unsigned int delay = 0;
+ int delay = 0;
ExtensionBlock *ext = gif->SavedImages[idx].ExtensionBlocks;
for (i = 0; i < gif->SavedImages[idx].ExtensionBlockCount; i++, ext++)
/* Append (... FUNCTION "BYTES") */
@@ -7392,7 +7425,7 @@
if (delay)
img->lisp_data
= Fcons (Qdelay,
- Fcons (make_float (((double) delay) * 0.01),
+ Fcons (make_float (delay / 100.0),
img->lisp_data));
}
@@ -7568,10 +7601,10 @@
Lisp_Object image;
Lisp_Object value;
Lisp_Object crop;
- long ino;
+ EMACS_INT ino;
int desired_width, desired_height;
double rotation;
- int imagemagick_rendermethod;
+ EMACS_INT imagemagick_rendermethod;
int pixelwidth;
ImageInfo *image_info;
ExceptionInfo *exception;
@@ -7598,7 +7631,7 @@
status = MagickPingImageBlob (ping_wand, contents, size);
}
- if (ino >= MagickGetNumberImages (ping_wand))
+ if (! (0 <= ino && ino < MagickGetNumberImages (ping_wand)))
{
image_error ("Invalid image number `%s' in image `%s'",
image, img->spec);
@@ -7673,28 +7706,28 @@
efficient. */
crop = image_spec_value (img->spec, QCcrop, NULL);
- if (CONSP (crop) && INTEGERP (XCAR (crop)))
+ if (CONSP (crop) && TYPE_RANGED_INTEGERP (size_t, XCAR (crop)))
{
/* After some testing, it seems MagickCropImage is the fastest crop
function in ImageMagick. This crop function seems to do less copying
than the alternatives, but it still reads the entire image into memory
- before croping, which is aparently difficult to avoid when using
+ before cropping, which is apparently difficult to avoid when using
imagemagick. */
- int w, h;
- w = XFASTINT (XCAR (crop));
+ size_t crop_width = XINT (XCAR (crop));
crop = XCDR (crop);
- if (CONSP (crop) && INTEGERP (XCAR (crop)))
+ if (CONSP (crop) && TYPE_RANGED_INTEGERP (size_t, XCAR (crop)))
{
- h = XFASTINT (XCAR (crop));
+ size_t crop_height = XINT (XCAR (crop));
crop = XCDR (crop);
- if (CONSP (crop) && INTEGERP (XCAR (crop)))
+ if (CONSP (crop) && TYPE_RANGED_INTEGERP (ssize_t, XCAR (crop)))
{
- x = XFASTINT (XCAR (crop));
+ ssize_t crop_x = XINT (XCAR (crop));
crop = XCDR (crop);
- if (CONSP (crop) && INTEGERP (XCAR (crop)))
+ if (CONSP (crop) && TYPE_RANGED_INTEGERP (ssize_t, XCAR (crop)))
{
- y = XFASTINT (XCAR (crop));
- MagickCropImage (image_wand, w, h, x, y);
+ ssize_t crop_y = XINT (XCAR (crop));
+ MagickCropImage (image_wand, crop_width, crop_height,
+ crop_x, crop_y);
}
}
}
@@ -7740,9 +7773,11 @@
init_color_table ();
imagemagick_rendermethod = (INTEGERP (Vimagemagick_render_type)
- ? XFASTINT (Vimagemagick_render_type) : 0);
+ ? XINT (Vimagemagick_render_type) : 0);
if (imagemagick_rendermethod == 0)
{
+ size_t image_height;
+
/* Try to create a x pixmap to hold the imagemagick pixmap. */
if (!x_create_x_image_and_pixmap (f, width, height, 0,
&ximg, &img->pixmap))
@@ -7771,7 +7806,8 @@
goto imagemagick_error;
}
- for (y = 0; y < (long) MagickGetImageHeight (image_wand); y++)
+ image_height = MagickGetImageHeight (image_wand);
+ for (y = 0; y < image_height; y++)
{
pixels = PixelGetNextIteratorRow (iterator, &width);
if (pixels == (PixelWand **) NULL)
@@ -8277,10 +8313,10 @@
{
for (x = 0; x < width; ++x)
{
- unsigned red;
- unsigned green;
- unsigned blue;
- unsigned opacity;
+ int red;
+ int green;
+ int blue;
+ int opacity;
red = *pixels++;
green = *pixels++;
@@ -8461,7 +8497,8 @@
static int
gs_load (struct frame *f, struct image *img)
{
- char buffer[100];
+ uprintmax_t printnum1, printnum2;
+ char buffer[sizeof " " + INT_STRLEN_BOUND (printmax_t)];
Lisp_Object window_and_pixmap_id = Qnil, loader, pt_height, pt_width;
Lisp_Object frame;
double in_width, in_height;
@@ -8473,16 +8510,19 @@
info. */
pt_width = image_spec_value (img->spec, QCpt_width, NULL);
in_width = INTEGERP (pt_width) ? XFASTINT (pt_width) / 72.0 : 0;
- img->width = in_width * FRAME_X_DISPLAY_INFO (f)->resx;
+ in_width *= FRAME_X_DISPLAY_INFO (f)->resx;
pt_height = image_spec_value (img->spec, QCpt_height, NULL);
in_height = INTEGERP (pt_height) ? XFASTINT (pt_height) / 72.0 : 0;
- img->height = in_height * FRAME_X_DISPLAY_INFO (f)->resy;
+ in_height *= FRAME_X_DISPLAY_INFO (f)->resy;
- if (!check_image_size (f, img->width, img->height))
+ if (! (in_width <= INT_MAX && in_height <= INT_MAX
+ && check_image_size (f, in_width, in_height)))
{
image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
return 0;
}
+ img->width = in_width;
+ img->height = in_height;
/* Create the pixmap. */
xassert (img->pixmap == NO_PIXMAP);
@@ -8507,14 +8547,14 @@
if successful. We do not record_unwind_protect here because
other places in redisplay like calling window scroll functions
don't either. Let the Lisp loader use `unwind-protect' instead. */
- sprintf (buffer, "%lu %lu",
- (unsigned long) FRAME_X_WINDOW (f),
- (unsigned long) img->pixmap);
+ printnum1 = FRAME_X_WINDOW (f);
+ printnum2 = img->pixmap;
+ sprintf (buffer, "%"pMu" %"pMu, printnum1, printnum2);
window_and_pixmap_id = build_string (buffer);
- sprintf (buffer, "%lu %lu",
- FRAME_FOREGROUND_PIXEL (f),
- FRAME_BACKGROUND_PIXEL (f));
+ printnum1 = FRAME_FOREGROUND_PIXEL (f);
+ printnum2 = FRAME_BACKGROUND_PIXEL (f);
+ sprintf (buffer, "%"pMu" %"pMu, printnum1, printnum2);
pixel_colors = build_string (buffer);
XSETFRAME (frame, f);
@@ -8539,7 +8579,8 @@
x_kill_gs_process (Pixmap pixmap, struct frame *f)
{
struct image_cache *c = FRAME_IMAGE_CACHE (f);
- int class, i;
+ int class;
+ ptrdiff_t i;
struct image *img;
/* Find the image containing PIXMAP. */
@@ -8643,7 +8684,7 @@
DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "")
(Lisp_Object spec)
{
- int id = -1;
+ ptrdiff_t id = -1;
if (valid_image_p (spec))
id = lookup_image (SELECTED_FRAME (), spec);
=== modified file 'src/indent.c'
--- src/indent.c 2011-07-14 21:35:23 +0000
+++ src/indent.c 2011-07-19 00:42:24 +0000
@@ -284,7 +284,7 @@
else \
{
\
if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, ch))) \
- width = ASIZE (DISP_CHAR_VECTOR (dp, ch)); \
+ width = sanitize_char_width (ASIZE (DISP_CHAR_VECTOR (dp, ch))); \
else \
width = CHAR_WIDTH (ch); \
}
\
@@ -318,15 +318,6 @@
last_known_column_point = 0;
}
-/* Return a non-outlandish value for the tab width. */
-
-static int
-sane_tab_width (void)
-{
- EMACS_INT n = XFASTINT (BVAR (current_buffer, tab_width));
- return 0 < n && n <= 1000 ? n : 8;
-}
-
EMACS_INT
current_column (void)
{
@@ -335,7 +326,7 @@
register int tab_seen;
EMACS_INT post_tab;
register int c;
- int tab_width = sane_tab_width ();
+ int tab_width = SANE_TAB_WIDTH (current_buffer);
int ctl_arrow = !NILP (BVAR (current_buffer, ctl_arrow));
register struct Lisp_Char_Table *dp = buffer_display_table ();
@@ -515,7 +506,7 @@
static void
scan_for_column (EMACS_INT *endpos, EMACS_INT *goalcol, EMACS_INT *prevcol)
{
- int tab_width = sane_tab_width ();
+ int tab_width = SANE_TAB_WIDTH (current_buffer);
register int ctl_arrow = !NILP (BVAR (current_buffer, ctl_arrow));
register struct Lisp_Char_Table *dp = buffer_display_table ();
int multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));
@@ -732,7 +723,7 @@
register int tab_seen;
int post_tab;
register int c;
- int tab_width = sane_tab_width ();
+ int tab_width = SANE_TAB_WIDTH (current_buffer);
int ctl_arrow = !NILP (current_buffer->ctl_arrow);
register struct Lisp_Char_Table *dp = buffer_display_table ();
int b, e;
@@ -808,7 +799,7 @@
{
EMACS_INT mincol;
register EMACS_INT fromcol;
- int tab_width = sane_tab_width ();
+ int tab_width = SANE_TAB_WIDTH (current_buffer);
CHECK_NUMBER (column);
if (NILP (minimum))
@@ -867,7 +858,7 @@
position_indentation (register int pos_byte)
{
register EMACS_INT column = 0;
- int tab_width = sane_tab_width ();
+ int tab_width = SANE_TAB_WIDTH (current_buffer);
register unsigned char *p;
register unsigned char *stop;
unsigned char *start;
@@ -1116,7 +1107,7 @@
register EMACS_INT pos;
EMACS_INT pos_byte;
register int c = 0;
- int tab_width = sane_tab_width ();
+ int tab_width = SANE_TAB_WIDTH (current_buffer);
register int ctl_arrow = !NILP (BVAR (current_buffer, ctl_arrow));
register struct Lisp_Char_Table *dp = window_display_table (win);
EMACS_INT selective
=== modified file 'src/keyboard.c'
--- src/keyboard.c 2011-07-14 20:40:35 +0000
+++ src/keyboard.c 2011-07-29 00:30:00 +0000
@@ -435,16 +435,16 @@
static int read_avail_input (int);
static void get_input_pending (int *, int);
static int readable_events (int);
-static Lisp_Object read_char_x_menu_prompt (int, Lisp_Object *,
+static Lisp_Object read_char_x_menu_prompt (ptrdiff_t, Lisp_Object *,
Lisp_Object, int *);
-static Lisp_Object read_char_minibuf_menu_prompt (int, int,
+static Lisp_Object read_char_minibuf_menu_prompt (int, ptrdiff_t,
Lisp_Object *);
static Lisp_Object make_lispy_event (struct input_event *);
#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
static Lisp_Object make_lispy_movement (struct frame *, Lisp_Object,
enum scroll_bar_part,
Lisp_Object, Lisp_Object,
- unsigned long);
+ Time);
#endif
static Lisp_Object modify_event_symbol (EMACS_INT, unsigned, Lisp_Object,
Lisp_Object, const char *const *,
@@ -1300,7 +1300,7 @@
/* This is the actual command reading loop,
sans error-handling encapsulation. */
-static int read_key_sequence (Lisp_Object *, size_t, Lisp_Object,
+static int read_key_sequence (Lisp_Object *, int, Lisp_Object,
int, int, int);
void safe_run_hooks (Lisp_Object);
static void adjust_point_for_property (EMACS_INT, int);
@@ -2267,7 +2267,8 @@
Value is t if we showed a menu and the user rejected it. */
Lisp_Object
-read_char (int commandflag, int nmaps, Lisp_Object *maps, Lisp_Object
prev_event,
+read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps,
+ Lisp_Object prev_event,
int *used_mouse_menu, struct timeval *end_time)
{
volatile Lisp_Object c;
@@ -7405,7 +7406,7 @@
{
/* The number of keymaps we're scanning right now, and the number of
keymaps we have allocated space for. */
- int nmaps;
+ ptrdiff_t nmaps;
/* maps[0..nmaps-1] are the prefix definitions of KEYBUF[0..t-1]
in the current keymaps, or nil where it is not a prefix. */
@@ -7413,7 +7414,7 @@
Lisp_Object def, tail;
- int mapno;
+ ptrdiff_t mapno;
Lisp_Object oquit;
/* In order to build the menus, we need to call the keymap
@@ -7458,7 +7459,7 @@
recognized when the menu-bar (or mode-line) is updated,
which does not normally happen after every command. */
Lisp_Object tem;
- int nminor;
+ ptrdiff_t nminor;
nminor = current_minor_maps (NULL, &tmaps);
maps = (Lisp_Object *) alloca ((nminor + 3) * sizeof (maps[0]));
nmaps = 0;
@@ -7962,7 +7963,7 @@
tool_bar_items (Lisp_Object reuse, int *nitems)
{
Lisp_Object *maps;
- int nmaps, i;
+ ptrdiff_t nmaps, i;
Lisp_Object oquit;
Lisp_Object *tmaps;
@@ -8002,7 +8003,7 @@
recognized when the tool-bar (or mode-line) is updated,
which does not normally happen after every command. */
Lisp_Object tem;
- int nminor;
+ ptrdiff_t nminor;
nminor = current_minor_maps (NULL, &tmaps);
maps = (Lisp_Object *) alloca ((nminor + 3) * sizeof (maps[0]));
nmaps = 0;
@@ -8274,10 +8275,11 @@
Lisp_Object tcapt = PROP (TOOL_BAR_ITEM_CAPTION);
const char *label = SYMBOLP (tkey) ? SSDATA (SYMBOL_NAME (tkey)) : "";
const char *capt = STRINGP (tcapt) ? SSDATA (tcapt) : "";
- EMACS_INT max_lbl = 2 * tool_bar_max_label_size;
+ ptrdiff_t max_lbl =
+ 2 * max (0, min (tool_bar_max_label_size, STRING_BYTES_BOUND / 2));
char *buf = (char *) xmalloc (max_lbl + 1);
Lisp_Object new_lbl;
- size_t caption_len = strlen (capt);
+ ptrdiff_t caption_len = strlen (capt);
if (caption_len <= max_lbl && capt[0] != '\0')
{
@@ -8290,7 +8292,7 @@
if (strlen (label) <= max_lbl && label[0] != '\0')
{
- int j;
+ ptrdiff_t j;
if (label != buf)
strcpy (buf, label);
@@ -8399,10 +8401,10 @@
and do auto-saving in the inner call of read_char. */
static Lisp_Object
-read_char_x_menu_prompt (int nmaps, Lisp_Object *maps, Lisp_Object prev_event,
- int *used_mouse_menu)
+read_char_x_menu_prompt (ptrdiff_t nmaps, Lisp_Object *maps,
+ Lisp_Object prev_event, int *used_mouse_menu)
{
- int mapno;
+ ptrdiff_t mapno;
if (used_mouse_menu)
*used_mouse_menu = 0;
@@ -8430,7 +8432,7 @@
Lisp_Object *realmaps
= (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object));
Lisp_Object value;
- int nmaps1 = 0;
+ ptrdiff_t nmaps1 = 0;
/* Use the maps that are not nil. */
for (mapno = 0; mapno < nmaps; mapno++)
@@ -8481,17 +8483,18 @@
We make this bigger when necessary, and never free it. */
static char *read_char_minibuf_menu_text;
/* Size of that buffer. */
-static int read_char_minibuf_menu_width;
+static ptrdiff_t read_char_minibuf_menu_width;
static Lisp_Object
-read_char_minibuf_menu_prompt (int commandflag, int nmaps, Lisp_Object *maps)
+read_char_minibuf_menu_prompt (int commandflag,
+ ptrdiff_t nmaps, Lisp_Object *maps)
{
- int mapno;
+ ptrdiff_t mapno;
register Lisp_Object name;
- int nlength;
+ ptrdiff_t nlength;
/* FIXME: Use the minibuffer's frame width. */
- int width = FRAME_COLS (SELECTED_FRAME ()) - 4;
- int idx = -1;
+ ptrdiff_t width = FRAME_COLS (SELECTED_FRAME ()) - 4;
+ ptrdiff_t idx = -1;
int nobindings = 1;
Lisp_Object rest, vector;
char *menu;
@@ -8516,16 +8519,13 @@
/* Make sure we have a big enough buffer for the menu text. */
width = max (width, SBYTES (name));
- if (read_char_minibuf_menu_text == 0)
- {
- read_char_minibuf_menu_width = width + 4;
- read_char_minibuf_menu_text = (char *) xmalloc (width + 4);
- }
- else if (width + 4 > read_char_minibuf_menu_width)
- {
- read_char_minibuf_menu_width = width + 4;
+ if (STRING_BYTES_BOUND - 4 < width)
+ memory_full (SIZE_MAX);
+ if (width + 4 > read_char_minibuf_menu_width)
+ {
read_char_minibuf_menu_text
= (char *) xrealloc (read_char_minibuf_menu_text, width + 4);
+ read_char_minibuf_menu_width = width + 4;
}
menu = read_char_minibuf_menu_text;
@@ -8544,7 +8544,7 @@
while (1)
{
int notfirst = 0;
- int i = nlength;
+ ptrdiff_t i = nlength;
Lisp_Object obj;
Lisp_Object orig_defn_macro;
@@ -8643,7 +8643,7 @@
< width
|| !notfirst)
{
- int thiswidth;
+ ptrdiff_t thiswidth;
/* Punctuate between strings. */
if (notfirst)
@@ -8659,9 +8659,7 @@
if (! char_matches)
{
/* Add as much of string as fits. */
- thiswidth = SCHARS (desc);
- if (thiswidth + i > width)
- thiswidth = width - i;
+ thiswidth = min (SCHARS (desc), width - i);
memcpy (menu + i, SDATA (desc), thiswidth);
i += thiswidth;
strcpy (menu + i, " = ");
@@ -8669,9 +8667,7 @@
}
/* Add as much of string as fits. */
- thiswidth = SCHARS (s);
- if (thiswidth + i > width)
- thiswidth = width - i;
+ thiswidth = min (SCHARS (s), width - i);
memcpy (menu + i, SDATA (s), thiswidth);
i += thiswidth;
menu[i] = 0;
@@ -8746,10 +8742,10 @@
NEXT may be the same array as CURRENT. */
static int
-follow_key (Lisp_Object key, int nmaps, Lisp_Object *current, Lisp_Object
*defs,
- Lisp_Object *next)
+follow_key (Lisp_Object key, ptrdiff_t nmaps, Lisp_Object *current,
+ Lisp_Object *defs, Lisp_Object *next)
{
- int i, first_binding;
+ ptrdiff_t i, first_binding;
first_binding = nmaps;
for (i = nmaps - 1; i >= 0; i--)
@@ -8849,7 +8845,7 @@
The return value is non-zero if the remapping actually took place. */
static int
-keyremap_step (Lisp_Object *keybuf, size_t bufsize, volatile keyremap *fkey,
+keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey,
int input, int doit, int *diff, Lisp_Object prompt)
{
Lisp_Object next, key;
@@ -8871,7 +8867,7 @@
*diff = len - (fkey->end - fkey->start);
- if (input + *diff >= bufsize)
+ if (bufsize - input <= *diff)
error ("Key sequence too long");
/* Shift the keys that follow fkey->end. */
@@ -8942,7 +8938,7 @@
from the selected window's buffer. */
static int
-read_key_sequence (Lisp_Object *keybuf, size_t bufsize, Lisp_Object prompt,
+read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
int dont_downcase_last, int can_return_switch_frame,
int fix_current_buffer)
{
@@ -8959,8 +8955,8 @@
/* The number of keymaps we're scanning right now, and the number of
keymaps we have allocated space for. */
- int nmaps;
- int nmaps_allocated = 0;
+ ptrdiff_t nmaps;
+ ptrdiff_t nmaps_allocated = 0;
/* defs[0..nmaps-1] are the definitions of KEYBUF[0..t-1] in
the current keymaps. */
@@ -8984,7 +8980,7 @@
/* The index in submaps[] of the first keymap that has a binding for
this key sequence. In other words, the lowest i such that
submaps[i] is non-nil. */
- int first_binding;
+ ptrdiff_t first_binding;
/* Index of the first key that has no binding.
It is useless to try fkey.start larger than that. */
int first_unbound;
@@ -9145,8 +9141,8 @@
}
else
{
- int nminor;
- int total;
+ ptrdiff_t nminor;
+ ptrdiff_t total;
Lisp_Object *maps;
nminor = current_minor_maps (0, &maps);
@@ -9212,7 +9208,8 @@
echo_local_start and keys_local_start allow us to throw away
just one key. */
int echo_local_start IF_LINT (= 0);
- int keys_local_start, local_first_binding;
+ int keys_local_start;
+ ptrdiff_t local_first_binding;
eassert (indec.end == t || (indec.end > t && indec.end <= mock_input));
eassert (indec.start <= indec.end);
@@ -9549,7 +9546,7 @@
&& (NILP (fake_prefixed_keys)
|| NILP (Fmemq (key, fake_prefixed_keys))))
{
- if (t + 1 >= bufsize)
+ if (bufsize - t <= 1)
error ("Key sequence too long");
keybuf[t] = posn;
@@ -9630,7 +9627,7 @@
insert the dummy prefix event `menu-bar'. */
if (EQ (posn, Qmenu_bar) || EQ (posn, Qtool_bar))
{
- if (t + 1 >= bufsize)
+ if (bufsize - t <= 1)
error ("Key sequence too long");
keybuf[t] = posn;
keybuf[t+1] = key;
=== modified file 'src/keyboard.h'
--- src/keyboard.h 2011-07-07 17:55:38 +0000
+++ src/keyboard.h 2011-07-29 00:30:00 +0000
@@ -440,7 +440,7 @@
extern Lisp_Object parse_modifiers (Lisp_Object);
extern Lisp_Object reorder_modifiers (Lisp_Object);
-extern Lisp_Object read_char (int, int, Lisp_Object *, Lisp_Object,
+extern Lisp_Object read_char (int, ptrdiff_t, Lisp_Object *, Lisp_Object,
int *, EMACS_TIME *);
extern int parse_solitary_modifier (Lisp_Object symbol);
=== modified file 'src/keymap.c'
--- src/keymap.c 2011-07-12 21:12:36 +0000
+++ src/keymap.c 2011-07-29 00:32:09 +0000
@@ -1403,7 +1403,7 @@
some systems, static gets macro-defined to be the empty string.
Ickypoo. */
static Lisp_Object *cmm_modes = NULL, *cmm_maps = NULL;
-static int cmm_size = 0;
+static ptrdiff_t cmm_size = 0;
/* Store a pointer to an array of the currently active minor modes in
*modeptr, a pointer to an array of the keymaps of the currently
@@ -1423,10 +1423,10 @@
loop. Instead, we'll use realloc/malloc and silently truncate the
list, let the key sequence be read, and hope some other piece of
code signals the error. */
-int
+ptrdiff_t
current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr)
{
- int i = 0;
+ ptrdiff_t i = 0;
int list_number = 0;
Lisp_Object alist, assoc, var, val;
Lisp_Object emulation_alists;
@@ -1469,9 +1469,16 @@
if (i >= cmm_size)
{
- int newsize, allocsize;
+ ptrdiff_t newsize, allocsize;
Lisp_Object *newmodes, *newmaps;
+ /* Check for size calculation overflow. Other code
+ (e.g., read_key_sequence) adds 3 to the count
+ later, so subtract 3 from the limit here. */
+ if (min (PTRDIFF_MAX, SIZE_MAX) / (2 * sizeof *newmodes) - 3
+ < cmm_size)
+ break;
+
newsize = cmm_size == 0 ? 30 : cmm_size * 2;
allocsize = newsize * sizeof *newmodes;
=== modified file 'src/keymap.h'
--- src/keymap.h 2011-07-07 17:19:10 +0000
+++ src/keymap.h 2011-07-29 00:32:09 +0000
@@ -38,7 +38,7 @@
EXFUN (Fset_keymap_parent, 2);
extern int describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
const char *, int, int, int, int);
-extern int current_minor_maps (Lisp_Object **, Lisp_Object **);
+extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **);
extern void initial_define_key (Lisp_Object, int, const char *);
extern void initial_define_lispy_key (Lisp_Object, const char *, const char *);
extern void syms_of_keymap (void);
=== modified file 'src/lisp.h'
--- src/lisp.h 2011-07-08 00:51:25 +0000
+++ src/lisp.h 2011-07-28 21:31:33 +0000
@@ -1704,6 +1704,11 @@
#define NUMBERP(x) (INTEGERP (x) || FLOATP (x))
#define NATNUMP(x) (INTEGERP (x) && XINT (x) >= 0)
+#define RANGED_INTEGERP(lo, x, hi) \
+ (INTEGERP (x) && (lo) <= XINT (x) && XINT (x) <= (hi))
+#define TYPE_RANGED_INTEGERP(type, x) \
+ RANGED_INTEGERP (TYPE_MINIMUM (type), x, TYPE_MAXIMUM (type))
+
#define INTEGERP(x) (LISP_INT_TAG_P (XTYPE ((x))))
#define SYMBOLP(x) (XTYPE ((x)) == Lisp_Symbol)
#define MISCP(x) (XTYPE ((x)) == Lisp_Misc)
@@ -2551,6 +2556,7 @@
/* Defined in fns.c */
extern Lisp_Object QCrehash_size, QCrehash_threshold;
+enum { NEXT_ALMOST_PRIME_LIMIT = 11 };
extern EMACS_INT next_almost_prime (EMACS_INT);
extern Lisp_Object larger_vector (Lisp_Object, EMACS_INT, Lisp_Object);
extern void sweep_weak_hash_tables (void);
@@ -2562,8 +2568,8 @@
Lisp_Object make_hash_table (Lisp_Object, Lisp_Object, Lisp_Object,
Lisp_Object, Lisp_Object, Lisp_Object,
Lisp_Object);
-EMACS_INT hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *);
-EMACS_INT hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object,
+ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *);
+ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object,
EMACS_UINT);
void init_weak_hash_tables (void);
extern void init_fns (void);
=== modified file 'src/lread.c'
--- src/lread.c 2011-07-28 20:23:19 +0000
+++ src/lread.c 2011-07-29 05:31:12 +0000
@@ -2613,14 +2613,14 @@
if (saved_doc_string_size == 0)
{
+ saved_doc_string = (char *) xmalloc (nskip + extra);
saved_doc_string_size = nskip + extra;
- saved_doc_string = (char *) xmalloc (saved_doc_string_size);
}
if (nskip > saved_doc_string_size)
{
- saved_doc_string_size = nskip + extra;
saved_doc_string = (char *) xrealloc (saved_doc_string,
- saved_doc_string_size);
+ nskip + extra);
+ saved_doc_string_size = nskip + extra;
}
saved_doc_string_position = file_tell (instream);
@@ -2883,7 +2883,8 @@
if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
memory_full (SIZE_MAX);
read_buffer = (char *) xrealloc (read_buffer,
- read_buffer_size *= 2);
+ read_buffer_size * 2);
+ read_buffer_size *= 2;
p = read_buffer + offset;
end = read_buffer + read_buffer_size;
}
@@ -3026,7 +3027,8 @@
if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
memory_full (SIZE_MAX);
read_buffer = (char *) xrealloc (read_buffer,
- read_buffer_size *= 2);
+ read_buffer_size * 2);
+ read_buffer_size *= 2;
p = read_buffer + offset;
end = read_buffer + read_buffer_size;
}
@@ -3056,7 +3058,8 @@
if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < read_buffer_size)
memory_full (SIZE_MAX);
read_buffer = (char *) xrealloc (read_buffer,
- read_buffer_size *= 2);
+ read_buffer_size * 2);
+ read_buffer_size *= 2;
p = read_buffer + offset;
end = read_buffer + read_buffer_size;
}
@@ -3938,6 +3941,7 @@
init_obarray (void)
{
Lisp_Object oblength;
+ ptrdiff_t size = 100 + MAX_MULTIBYTE_LENGTH;
XSETFASTINT (oblength, OBARRAY_SIZE);
@@ -3970,8 +3974,8 @@
DEFSYM (Qvariable_documentation, "variable-documentation");
- read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH;
- read_buffer = (char *) xmalloc (read_buffer_size);
+ read_buffer = (char *) xmalloc (size);
+ read_buffer_size = size;
}
void
=== modified file 'src/macros.c'
--- src/macros.c 2011-06-24 21:25:22 +0000
+++ src/macros.c 2011-07-29 01:00:29 +0000
@@ -62,9 +62,9 @@
if (!current_kboard->kbd_macro_buffer)
{
- current_kboard->kbd_macro_bufsize = 30;
current_kboard->kbd_macro_buffer
= (Lisp_Object *)xmalloc (30 * sizeof (Lisp_Object));
+ current_kboard->kbd_macro_bufsize = 30;
}
update_mode_lines++;
if (NILP (append))
@@ -202,7 +202,7 @@
if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *kb->kbd_macro_buffer / 2
< kb->kbd_macro_bufsize)
memory_full (SIZE_MAX);
- nbytes = kb->kbd_macro_bufsize * 2 * sizeof *kb->kbd_macro_buffer;
+ nbytes = kb->kbd_macro_bufsize * (2 * sizeof *kb->kbd_macro_buffer);
kb->kbd_macro_buffer
= (Lisp_Object *) xrealloc (kb->kbd_macro_buffer, nbytes);
kb->kbd_macro_bufsize *= 2;
=== modified file 'src/minibuf.c'
--- src/minibuf.c 2011-07-19 17:33:06 +0000
+++ src/minibuf.c 2011-07-29 01:01:17 +0000
@@ -261,7 +261,10 @@
if (len == size)
{
if (STRING_BYTES_BOUND / 2 < size)
- memory_full (SIZE_MAX);
+ {
+ xfree (line);
+ memory_full (SIZE_MAX);
+ }
size *= 2;
line = (char *) xrealloc (line, size);
}
@@ -1723,7 +1726,7 @@
(Lisp_Object string, Lisp_Object collection, Lisp_Object predicate)
{
Lisp_Object regexps, tail, tem = Qnil;
- EMACS_INT i = 0;
+ ptrdiff_t i = 0;
CHECK_STRING (string);
=== modified file 'src/nsmenu.m'
--- src/nsmenu.m 2011-07-28 18:30:59 +0000
+++ src/nsmenu.m 2011-07-29 05:31:12 +0000
@@ -1014,7 +1014,7 @@
BOOL enabled_p = !NILP (TOOLPROP (TOOL_BAR_ITEM_ENABLED_P));
BOOL selected_p = !NILP (TOOLPROP (TOOL_BAR_ITEM_SELECTED_P));
int idx;
- int img_id;
+ ptrdiff_t img_id;
struct image *img;
Lisp_Object image;
Lisp_Object helpObj;
=== modified file 'src/nsterm.h'
--- src/nsterm.h 2011-07-28 18:50:05 +0000
+++ src/nsterm.h 2011-07-29 05:31:12 +0000
@@ -416,8 +416,8 @@
/* this to map between emacs color indices and NSColor objects */
struct ns_color_table
{
- unsigned int size;
- unsigned int avail;
+ ptrdiff_t size;
+ ptrdiff_t avail;
#ifdef __OBJC__
NSColor **colors;
NSMutableSet *empty_indices;
=== modified file 'src/nsterm.m'
--- src/nsterm.m 2011-07-28 18:41:21 +0000
+++ src/nsterm.m 2011-07-29 05:31:12 +0000
@@ -1341,7 +1341,7 @@
ns_index_color (NSColor *color, struct frame *f)
{
struct ns_color_table *color_table = FRAME_NS_DISPLAY_INFO (f)->color_table;
- int idx;
+ ptrdiff_t idx;
NSNumber *index;
if (!color_table->colors)
@@ -1356,7 +1356,7 @@
/* do we already have this color ? */
{
- int i;
+ ptrdiff_t i;
for (i = 1; i < color_table->avail; i++)
{
if (color_table->colors[i] && [color_table->colors[i] isEqual: color])
@@ -1371,16 +1371,23 @@
{
index = [color_table->empty_indices anyObject];
[color_table->empty_indices removeObject: index];
- idx = [index unsignedIntValue];
+ idx = [index unsignedLongValue];
}
else
{
if (color_table->avail == color_table->size)
{
- color_table->size += NS_COLOR_CAPACITY;
+ ptrdiff_t size;
+ ptrdiff_t size_max =
+ min (ULONG_MAX,
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof (NSColor *));
+ if (size_max - NS_COLOR_CAPACITY < color_table->size)
+ memory_full (SIZE_MAX);
+ size = color_table->size + NS_COLOR_CAPACITY;
color_table->colors
= (NSColor **)xrealloc (color_table->colors,
- color_table->size * sizeof (NSColor *));
+ size * sizeof (NSColor *));
+ color_table->size = size;
}
idx = color_table->avail++;
}
@@ -2321,7 +2328,7 @@
if (!img)
{
unsigned short *bits = p->bits + p->dh;
- int len = 8 * p->h/8;
+ int len = p->h;
int i;
unsigned char *cbits = xmalloc (len);
@@ -4857,7 +4864,7 @@
}
}
-
+
#if !defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_6
/* if we get here we should send the key for input manager processing */
if (firstTime && [[NSInputManager currentInputManager]
=== modified file 'src/process.c'
--- src/process.c 2011-07-16 18:27:08 +0000
+++ src/process.c 2011-07-29 01:05:39 +0000
@@ -3567,6 +3567,12 @@
return Qnil;
again:
+ if (min (INT_MAX, min (PTRDIFF_MAX, SIZE_MAX)) / sizeof *ifreqs - 25
+ < ifaces)
+ {
+ xfree (ifreqs);
+ memory_full (SIZE_MAX);
+ }
ifaces += 25;
buf_size = ifaces * sizeof (ifreqs[0]);
ifreqs = (struct ifreq *)xrealloc(ifreqs, buf_size);
=== modified file 'src/region-cache.c'
--- src/region-cache.c 2011-04-19 00:34:42 +0000
+++ src/region-cache.c 2011-07-29 01:10:08 +0000
@@ -247,11 +247,16 @@
if (gap_len < min_size)
{
EMACS_INT i;
-
- /* Always make at least NEW_CACHE_GAP elements, as long as we're
- expanding anyway. */
- if (min_size < NEW_CACHE_GAP)
- min_size = NEW_CACHE_GAP;
+ ptrdiff_t cache_len_max =
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof *c->boundaries;
+ ptrdiff_t min_size_max = cache_len_max - c->cache_len;
+
+ if (min_size_max < min_size)
+ memory_full (SIZE_MAX);
+
+ /* Unless running out of space, make at least NEW_CACHE_GAP
+ elements, as long as we're expanding anyway. */
+ min_size = max (min_size, min (min_size_max, NEW_CACHE_GAP));
c->boundaries =
(struct boundary *) xrealloc (c->boundaries,
=== modified file 'src/scroll.c'
--- src/scroll.c 2011-06-22 18:15:23 +0000
+++ src/scroll.c 2011-07-29 01:11:37 +0000
@@ -969,32 +969,21 @@
const char *cleanup_string,
int coefficient)
{
- if (FRAME_INSERT_COST (frame) != 0)
- {
- FRAME_INSERT_COST (frame) =
- (int *) xrealloc (FRAME_INSERT_COST (frame),
- FRAME_LINES (frame) * sizeof (int));
- FRAME_DELETEN_COST (frame) =
- (int *) xrealloc (FRAME_DELETEN_COST (frame),
- FRAME_LINES (frame) * sizeof (int));
- FRAME_INSERTN_COST (frame) =
- (int *) xrealloc (FRAME_INSERTN_COST (frame),
- FRAME_LINES (frame) * sizeof (int));
- FRAME_DELETE_COST (frame) =
- (int *) xrealloc (FRAME_DELETE_COST (frame),
- FRAME_LINES (frame) * sizeof (int));
- }
- else
- {
- FRAME_INSERT_COST (frame) =
- (int *) xmalloc (FRAME_LINES (frame) * sizeof (int));
- FRAME_DELETEN_COST (frame) =
- (int *) xmalloc (FRAME_LINES (frame) * sizeof (int));
- FRAME_INSERTN_COST (frame) =
- (int *) xmalloc (FRAME_LINES (frame) * sizeof (int));
- FRAME_DELETE_COST (frame) =
- (int *) xmalloc (FRAME_LINES (frame) * sizeof (int));
- }
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (int) < FRAME_LINES (frame))
+ memory_full (SIZE_MAX);
+
+ FRAME_INSERT_COST (frame) =
+ (int *) xrealloc (FRAME_INSERT_COST (frame),
+ FRAME_LINES (frame) * sizeof (int));
+ FRAME_DELETEN_COST (frame) =
+ (int *) xrealloc (FRAME_DELETEN_COST (frame),
+ FRAME_LINES (frame) * sizeof (int));
+ FRAME_INSERTN_COST (frame) =
+ (int *) xrealloc (FRAME_INSERTN_COST (frame),
+ FRAME_LINES (frame) * sizeof (int));
+ FRAME_DELETE_COST (frame) =
+ (int *) xrealloc (FRAME_DELETE_COST (frame),
+ FRAME_LINES (frame) * sizeof (int));
ins_del_costs (frame,
ins_line_string, multi_ins_string,
=== modified file 'src/search.c'
--- src/search.c 2011-07-14 18:45:36 +0000
+++ src/search.c 2011-07-29 01:13:10 +0000
@@ -2648,6 +2648,8 @@
int really_changed = 0;
substed_alloc_size = length * 2 + 100;
+ if (min (PTRDIFF_MAX, SIZE_MAX) - 1 < substed_alloc_size)
+ memory_full (SIZE_MAX);
substed = (unsigned char *) xmalloc (substed_alloc_size + 1);
substed_len = 0;
@@ -2736,6 +2738,13 @@
/* Make sure SUBSTED is big enough. */
if (substed_len + add_len >= substed_alloc_size)
{
+ ptrdiff_t add_len_max =
+ min (PTRDIFF_MAX, SIZE_MAX) - 1 - 500 - substed_len;
+ if (add_len_max < add_len)
+ {
+ xfree (substed);
+ memory_full (SIZE_MAX);
+ }
substed_alloc_size = substed_len + add_len + 500;
substed = (unsigned char *) xrealloc (substed,
substed_alloc_size + 1);
@@ -2973,7 +2982,7 @@
If optional arg RESEAT is non-nil, make markers on LIST point nowhere. */)
(register Lisp_Object list, Lisp_Object reseat)
{
- register int i;
+ ptrdiff_t i;
register Lisp_Object marker;
if (running_asynch_code)
@@ -2987,10 +2996,13 @@
/* Allocate registers if they don't already exist. */
{
- int length = XFASTINT (Flength (list)) / 2;
+ ptrdiff_t length = XFASTINT (Flength (list)) / 2;
if (length > search_regs.num_regs)
{
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (regoff_t) < length)
+ memory_full (SIZE_MAX);
+
if (search_regs.num_regs == 0)
{
search_regs.start
=== modified file 'src/sysdep.c'
--- src/sysdep.c 2011-07-11 06:05:57 +0000
+++ src/sysdep.c 2011-07-29 01:16:54 +0000
@@ -2640,7 +2640,7 @@
ssize_t nread;
const char *cmd = NULL;
char *cmdline = NULL;
- size_t cmdsize = 0, cmdline_size;
+ ptrdiff_t cmdsize = 0, cmdline_size;
unsigned char c;
int proc_id, ppid, uid, gid, pgrp, sess, tty, tpgid, thcount;
unsigned long long u_time, s_time, cutime, cstime, start;
@@ -2822,8 +2822,10 @@
if (fd >= 0)
{
char ch;
- for (cmdline_size = 0; emacs_read (fd, &ch, 1) == 1; cmdline_size++)
+ for (cmdline_size = 0; cmdline_size < STRING_BYTES_BOUND; cmdline_size++)
{
+ if (emacs_read (fd, &ch, 1) != 1)
+ break;
c = ch;
if (isspace (c) || c == '\\')
cmdline_size++; /* for later quoting, see below */
@@ -2844,7 +2846,7 @@
nread = 0;
}
/* We don't want trailing null characters. */
- for (p = cmdline + nread - 1; p > cmdline && !*p; p--)
+ for (p = cmdline + nread; p > cmdline + 1 && !p[-1]; p--)
nread--;
for (p = cmdline; p < cmdline + nread; p++)
{
=== modified file 'src/term.c'
--- src/term.c 2011-07-14 17:28:42 +0000
+++ src/term.c 2011-07-29 01:22:19 +0000
@@ -136,10 +136,6 @@
static int max_frame_cols;
-/* The largest frame height in any call to calculate_costs. */
-
-static int max_frame_lines;
-
/* Non-zero if we have dropped our controlling tty and therefore
should not open a frame on stdout. */
static int no_controlling_tty;
@@ -497,8 +493,8 @@
static unsigned char *encode_terminal_src;
static unsigned char *encode_terminal_dst;
/* Allocated sizes of the above buffers. */
-static int encode_terminal_src_size;
-static int encode_terminal_dst_size;
+static ptrdiff_t encode_terminal_src_size;
+static ptrdiff_t encode_terminal_dst_size;
/* Encode SRC_LEN glyphs starting at SRC to terminal output codes.
Set CODING->produced to the byte-length of the resulting byte
@@ -509,8 +505,8 @@
{
struct glyph *src_end = src + src_len;
unsigned char *buf;
- int nchars, nbytes, required;
- register int tlen = GLYPH_TABLE_LENGTH;
+ ptrdiff_t nchars, nbytes, required;
+ ptrdiff_t tlen = GLYPH_TABLE_LENGTH;
register Lisp_Object *tbase = GLYPH_TABLE_BASE;
Lisp_Object charset_list;
@@ -518,13 +514,13 @@
multibyte-form. But, it may be enlarged on demand if
Vglyph_table contains a string or a composite glyph is
encountered. */
- required = MAX_MULTIBYTE_LENGTH * src_len;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / MAX_MULTIBYTE_LENGTH < src_len)
+ memory_full (SIZE_MAX);
+ required = src_len;
+ required *= MAX_MULTIBYTE_LENGTH;
if (encode_terminal_src_size < required)
{
- if (encode_terminal_src)
- encode_terminal_src = xrealloc (encode_terminal_src, required);
- else
- encode_terminal_src = xmalloc (required);
+ encode_terminal_src = xrealloc (encode_terminal_src, required);
encode_terminal_src_size = required;
}
@@ -544,19 +540,23 @@
if (src->u.cmp.automatic)
{
gstring = composition_gstring_from_id (src->u.cmp.id);
- required = src->slice.cmp.to + 1 - src->slice.cmp.from;
+ required = src->slice.cmp.to - src->slice.cmp.from + 1;
}
else
{
cmp = composition_table[src->u.cmp.id];
- required = MAX_MULTIBYTE_LENGTH * cmp->glyph_len;
+ required = cmp->glyph_len;
+ required *= MAX_MULTIBYTE_LENGTH;
}
- if (encode_terminal_src_size < nbytes + required)
+ if (encode_terminal_src_size - nbytes < required)
{
- encode_terminal_src_size = nbytes + required;
- encode_terminal_src = xrealloc (encode_terminal_src,
- encode_terminal_src_size);
+ ptrdiff_t size;
+ if (min (PTRDIFF_MAX, SIZE_MAX) - nbytes < required)
+ memory_full (SIZE_MAX);
+ size = nbytes + required;
+ encode_terminal_src = xrealloc (encode_terminal_src, size);
+ encode_terminal_src_size = size;
buf = encode_terminal_src + nbytes;
}
@@ -627,11 +627,15 @@
if (NILP (string))
{
nbytes = buf - encode_terminal_src;
- if (encode_terminal_src_size < nbytes + MAX_MULTIBYTE_LENGTH)
+ if (encode_terminal_src_size - nbytes < MAX_MULTIBYTE_LENGTH)
{
- encode_terminal_src_size = nbytes + MAX_MULTIBYTE_LENGTH;
- encode_terminal_src = xrealloc (encode_terminal_src,
- encode_terminal_src_size);
+ ptrdiff_t size;
+ if (min (PTRDIFF_MAX, SIZE_MAX) - MAX_MULTIBYTE_LENGTH
+ < nbytes)
+ memory_full (SIZE_MAX);
+ size = nbytes + MAX_MULTIBYTE_LENGTH;
+ encode_terminal_src = xrealloc (encode_terminal_src, size);
+ encode_terminal_src_size = size;
buf = encode_terminal_src + nbytes;
}
if (CHAR_BYTE8_P (c)
@@ -659,11 +663,14 @@
if (! STRING_MULTIBYTE (string))
string = string_to_multibyte (string);
nbytes = buf - encode_terminal_src;
- if (encode_terminal_src_size < nbytes + SBYTES (string))
+ if (encode_terminal_src_size - nbytes < SBYTES (string))
{
- encode_terminal_src_size = nbytes + SBYTES (string);
- encode_terminal_src = xrealloc (encode_terminal_src,
- encode_terminal_src_size);
+ ptrdiff_t size;
+ if (min (PTRDIFF_MAX, SIZE_MAX) - SBYTES (string) < nbytes)
+ memory_full (SIZE_MAX);
+ size = nbytes + SBYTES (string);
+ encode_terminal_src = xrealloc (encode_terminal_src, size);
+ encode_terminal_src_size = size;
buf = encode_terminal_src + nbytes;
}
memcpy (buf, SDATA (string), SBYTES (string));
@@ -684,12 +691,9 @@
coding->source = encode_terminal_src;
if (encode_terminal_dst_size == 0)
{
+ encode_terminal_dst = xrealloc (encode_terminal_dst,
+ encode_terminal_src_size);
encode_terminal_dst_size = encode_terminal_src_size;
- if (encode_terminal_dst)
- encode_terminal_dst = xrealloc (encode_terminal_dst,
- encode_terminal_dst_size);
- else
- encode_terminal_dst = xmalloc (encode_terminal_dst_size);
}
coding->destination = encode_terminal_dst;
coding->dst_bytes = encode_terminal_dst_size;
@@ -1156,18 +1160,14 @@
char_ins_del_vector (i.e., char_ins_del_cost) isn't used because
X turns off char_ins_del_ok. */
- max_frame_lines = max (max_frame_lines, FRAME_LINES (frame));
max_frame_cols = max (max_frame_cols, FRAME_COLS (frame));
+ if ((min (PTRDIFF_MAX, SIZE_MAX) / sizeof (int) - 1) / 2 <
max_frame_cols)
+ memory_full (SIZE_MAX);
- if (char_ins_del_vector != 0)
- char_ins_del_vector
- = (int *) xrealloc (char_ins_del_vector,
- (sizeof (int)
- + 2 * max_frame_cols * sizeof (int)));
- else
- char_ins_del_vector
- = (int *) xmalloc (sizeof (int)
- + 2 * max_frame_cols * sizeof (int));
+ char_ins_del_vector
+ = (int *) xrealloc (char_ins_del_vector,
+ (sizeof (int)
+ + 2 * max_frame_cols * sizeof (int)));
memset (char_ins_del_vector, 0,
(sizeof (int) + 2 * max_frame_cols * sizeof (int)));
=== modified file 'src/termcap.c'
--- src/termcap.c 2011-07-10 08:20:10 +0000
+++ src/termcap.c 2011-07-29 01:24:19 +0000
@@ -480,7 +480,7 @@
/* If BP is malloc'd by us, make sure it is big enough. */
if (malloc_size)
{
- int offset1 = bp1 - bp, offset2 = tc_search_point - bp;
+ ptrdiff_t offset1 = bp1 - bp, offset2 = tc_search_point - bp;
malloc_size = offset1 + buf.size;
bp = termcap_name = (char *) xrealloc (bp, malloc_size);
bp1 = termcap_name + offset1;
@@ -619,7 +619,6 @@
register char *end;
register int nread;
register char *buf = bufp->beg;
- register char *tem;
if (!append_end)
append_end = bufp->ptr;
@@ -636,14 +635,17 @@
{
if (bufp->full == bufp->size)
{
- if ((PTRDIFF_MAX - 1) / 2 < bufp->size)
+ ptrdiff_t ptr_offset = bufp->ptr - buf;
+ ptrdiff_t append_end_offset = append_end - buf;
+ ptrdiff_t size;
+ if ((min (PTRDIFF_MAX, SIZE_MAX) - 1) / 2 < bufp->size)
memory_full (SIZE_MAX);
- bufp->size *= 2;
+ size = 2 * bufp->size;
/* Add 1 to size to ensure room for terminating null. */
- tem = (char *) xrealloc (buf, bufp->size + 1);
- bufp->ptr = (bufp->ptr - buf) + tem;
- append_end = (append_end - buf) + tem;
- bufp->beg = buf = tem;
+ bufp->beg = buf = (char *) xrealloc (buf, size + 1);
+ bufp->size = size;
+ bufp->ptr = buf + ptr_offset;
+ append_end = buf + append_end_offset;
}
}
else
=== modified file 'src/termhooks.h'
--- src/termhooks.h 2011-06-06 19:43:39 +0000
+++ src/termhooks.h 2011-07-20 00:09:31 +0000
@@ -288,12 +288,12 @@
/* The next four modifier bits are used also in keyboard events at
the Lisp level.
- It's probably not the greatest idea to use the 2^23 bit for any
+ It's probably not the greatest idea to use the 2^28 bit for any
modifier. It may or may not be the sign bit, depending on
- VALBITS, so using it to represent a modifier key means that
+ FIXNUM_BITS, so using it to represent a modifier key means that
characters thus modified have different integer equivalents
depending on the architecture they're running on. Oh, and
- applying XINT to a character whose 2^23 bit is set sign-extends
+ applying XINT to a character whose 2^28 bit is set might sign-extend
it, so you get a bunch of bits in the mask you didn't want.
The CHAR_ macros are defined in lisp.h. */
=== modified file 'src/tparam.c'
--- src/tparam.c 2011-07-10 08:20:10 +0000
+++ src/tparam.c 2011-07-29 01:49:31 +0000
@@ -79,33 +79,38 @@
register const char *p = string;
register char *op = outstring;
char *outend;
- int outlen = 0;
+ char *new = 0;
+ ptrdiff_t outlen = 0;
register int tem;
int *old_argp = argp; /* can move */
int *fixed_argp = argp; /* never moves */
int explicit_param_p = 0; /* set by %p */
- int doleft = 0;
- int doup = 0;
+ ptrdiff_t doleft = 0;
+ ptrdiff_t doup = 0;
+ ptrdiff_t append_len = 0;
outend = outstring + len;
while (1)
{
/* If the buffer might be too short, make it bigger. */
- if (op + 5 >= outend)
+ while (outend - op - append_len <= 5)
{
- register char *new;
- int offset = op - outstring;
+ ptrdiff_t offset = op - outstring;
if (outlen == 0)
{
+ if (min (PTRDIFF_MAX, SIZE_MAX) - 40 < len)
+ goto out_of_memory;
outlen = len + 40;
new = (char *) xmalloc (outlen);
memcpy (new, outstring, offset);
}
else
{
+ if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < outlen)
+ goto out_of_memory;
outlen *= 2;
new = (char *) xrealloc (outstring, outlen);
}
@@ -167,11 +172,19 @@
and this is one of them, increment it. */
while (tem == 0 || tem == '\n' || tem == '\t')
{
+ ptrdiff_t append_len_incr;
tem++;
if (argp == old_argp)
- doup++, outend -= strlen (up);
+ doup++, append_len_incr = strlen (up);
else
- doleft++, outend -= strlen (left);
+ doleft++, append_len_incr = strlen (left);
+ if (PTRDIFF_MAX - append_len < append_len_incr)
+ {
+ out_of_memory:
+ xfree (new);
+ memory_full (SIZE_MAX);
+ }
+ append_len += append_len_incr;
}
}
*op++ = tem ? tem : 0200;
=== modified file 'src/window.c'
--- src/window.c 2011-07-14 17:28:42 +0000
+++ src/window.c 2011-07-19 21:39:36 +0000
@@ -5069,7 +5069,7 @@
&& (!EQ (Vrecenter_redisplay, Qtty)
|| !NILP (Ftty_type (selected_frame))))
{
- int i;
+ ptrdiff_t i;
/* Invalidate pixel data calculated for all compositions. */
for (i = 0; i < n_compositions; i++)
=== modified file 'src/xdisp.c'
--- src/xdisp.c 2011-07-28 06:44:45 +0000
+++ src/xdisp.c 2011-07-29 05:31:12 +0000
@@ -2478,10 +2478,7 @@
else if (INTEGERP (w->redisplay_end_trigger))
it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger);
- /* Correct bogus values of tab_width. */
- it->tab_width = XINT (BVAR (current_buffer, tab_width));
- if (it->tab_width <= 0 || it->tab_width > 1000)
- it->tab_width = 8;
+ it->tab_width = SANE_TAB_WIDTH (current_buffer);
/* Are lines in the display truncated? */
if (base_face_id != DEFAULT_FACE_ID
@@ -10390,8 +10387,12 @@
double the buffer's size. */
if (mode_line_noprop_ptr == mode_line_noprop_buf_end)
{
- int len = MODE_LINE_NOPROP_LEN (0);
- int new_size = 2 * len * sizeof *mode_line_noprop_buf;
+ ptrdiff_t len = MODE_LINE_NOPROP_LEN (0);
+ ptrdiff_t new_size;
+
+ if (STRING_BYTES_BOUND / 2 < len)
+ memory_full (SIZE_MAX);
+ new_size = 2 * len;
mode_line_noprop_buf = (char *) xrealloc (mode_line_noprop_buf,
new_size);
mode_line_noprop_buf_end = mode_line_noprop_buf + new_size;
mode_line_noprop_ptr = mode_line_noprop_buf + len;
@@ -10455,9 +10456,9 @@
/* Do we have more than one visible frame on this X display? */
Lisp_Object tail;
Lisp_Object fmt;
- int title_start;
+ ptrdiff_t title_start;
char *title;
- int len;
+ ptrdiff_t len;
struct it it;
int count = SPECPDL_INDEX ();
@@ -21268,7 +21269,7 @@
if (FRAME_WINDOW_P (it->f)
&& valid_image_p (prop))
{
- int id = lookup_image (it->f, prop);
+ ptrdiff_t id = lookup_image (it->f, prop);
struct image *img = IMAGE_FROM_ID (it->f, id);
return OK_PIXELS (width_p ? img->width : img->height);
@@ -22140,7 +22141,7 @@
do { \
int face_id = (row)->glyphs[area][START].face_id; \
struct face *base_face = FACE_FROM_ID (f, face_id);
\
- int cmp_id = (row)->glyphs[area][START].u.cmp.id; \
+ ptrdiff_t cmp_id = (row)->glyphs[area][START].u.cmp.id; \
struct composition *cmp = composition_table[cmp_id]; \
XChar2b *char2b; \
struct glyph_string *first_s IF_LINT (= NULL); \
=== modified file 'src/xfaces.c'
--- src/xfaces.c 2011-07-28 00:15:43 +0000
+++ src/xfaces.c 2011-07-29 05:31:12 +0000
@@ -2668,8 +2668,13 @@
property `face' of the Lisp face name. */
if (next_lface_id == lface_id_to_name_size)
{
- int new_size = max (50, 2 * lface_id_to_name_size);
- int sz = new_size * sizeof *lface_id_to_name;
+ ptrdiff_t new_size, sz;
+ if (min (min (PTRDIFF_MAX, SIZE_MAX) / 2 / sizeof *lface_id_to_name,
+ MOST_POSITIVE_FIXNUM)
+ < lface_id_to_name_size)
+ memory_full (SIZE_MAX);
+ new_size = max (50, 2 * lface_id_to_name_size);
+ sz = new_size * sizeof *lface_id_to_name;
lface_id_to_name = (Lisp_Object *) xrealloc (lface_id_to_name, sz);
lface_id_to_name_size = new_size;
}
@@ -4412,7 +4417,10 @@
if (c->used == c->size)
{
int new_size, sz;
- new_size = min (2 * c->size, MAX_FACE_ID);
+ new_size =
+ min (2 * c->size,
+ min (MAX_FACE_ID,
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof *c->faces_by_id));
if (new_size == c->size)
abort (); /* Alternatives? ++kfs */
sz = new_size * sizeof *c->faces_by_id;
=== modified file 'src/xfns.c'
--- src/xfns.c 2011-07-23 12:15:53 +0000
+++ src/xfns.c 2011-07-29 05:31:12 +0000
@@ -145,7 +145,8 @@
Lisp_Object Qfont_param;
#if GLYPH_DEBUG
-static int image_cache_refcount, dpyinfo_refcount;
+static ptrdiff_t image_cache_refcount;
+static int dpyinfo_refcount;
#endif
#if defined (USE_GTK) && defined (HAVE_FREETYPE)
@@ -1470,7 +1471,8 @@
the result should be `COMPOUND_TEXT'. */
static unsigned char *
-x_encode_text (Lisp_Object string, Lisp_Object coding_system, int selectionp,
int *text_bytes, int *stringp, int *freep)
+x_encode_text (Lisp_Object string, Lisp_Object coding_system, int selectionp,
+ ptrdiff_t *text_bytes, int *stringp, int *freep)
{
int result = string_xstring_p (string);
struct coding_system coding;
@@ -1488,6 +1490,8 @@
coding.mode |= (CODING_MODE_SAFE_ENCODING | CODING_MODE_LAST_BLOCK);
/* We suppress producing escape sequences for composition. */
coding.common_flags &= ~CODING_ANNOTATION_MASK;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / 2 < SCHARS (string))
+ memory_full (SIZE_MAX);
coding.dst_bytes = SCHARS (string) * 2;
coding.destination = (unsigned char *) xmalloc (coding.dst_bytes);
encode_coding_object (&coding, string, 0, 0,
@@ -1511,7 +1515,8 @@
BLOCK_INPUT;
{
XTextProperty text, icon;
- int bytes, stringp;
+ ptrdiff_t bytes;
+ int stringp;
int do_free_icon_value = 0, do_free_text_value = 0;
Lisp_Object coding_system;
Lisp_Object encoded_name;
@@ -1550,6 +1555,8 @@
: FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
text.format = 8;
text.nitems = bytes;
+ if (text.nitems != bytes)
+ error ("Window name too large");
if (!STRINGP (f->icon_name))
{
@@ -1565,6 +1572,8 @@
: FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
icon.format = 8;
icon.nitems = bytes;
+ if (icon.nitems != bytes)
+ error ("Icon name too large");
encoded_icon_name = ENCODE_UTF_8 (f->icon_name);
}
@@ -4193,21 +4202,21 @@
if (CONSP (value))
{
+ ptrdiff_t elsize;
+
nelements = x_check_property_data (value);
if (nelements == -1)
error ("Bad data in VALUE, must be number, string or cons");
- if (element_format == 8)
- data = (unsigned char *) xmalloc (nelements);
- else if (element_format == 16)
- data = (unsigned char *) xmalloc (nelements*2);
- else /* format == 32 */
- /* The man page for XChangeProperty:
- "If the specified format is 32, the property data must be a
- long array."
- This applies even if long is more than 64 bits. The X library
- converts to 32 bits before sending to the X server. */
- data = (unsigned char *) xmalloc (nelements * sizeof(long));
+ /* The man page for XChangeProperty:
+ "If the specified format is 32, the property data must be a
+ long array."
+ This applies even if long is more than 32 bits. The X library
+ converts to 32 bits before sending to the X server. */
+ elsize = element_format == 32 ? sizeof (long) : element_format >> 3;
+ if (min (PTRDIFF_MAX, SIZE_MAX) / elsize < nelements)
+ memory_full (SIZE_MAX);
+ data = (unsigned char *) xmalloc (nelements * elsize);
x_fill_property_data (FRAME_X_DISPLAY (f), value, data, element_format);
}
@@ -4215,7 +4224,9 @@
{
CHECK_STRING (value);
data = SDATA (value);
- nelements = SCHARS (value);
+ if (INT_MAX < SBYTES (value))
+ error ("VALUE too long");
+ nelements = SBYTES (value);
}
BLOCK_INPUT;
=== modified file 'src/xgselect.c'
--- src/xgselect.c 2011-07-01 09:18:46 +0000
+++ src/xgselect.c 2011-07-29 01:56:54 +0000
@@ -54,10 +54,16 @@
do {
if (n_gfds > gfds_size)
{
- while (n_gfds > gfds_size)
- gfds_size *= 2;
+ int gfds_size_max =
+ min (INT_MAX, min (PTRDIFF_MAX, SIZE_MAX) / sizeof *gfds);
+ int size;
+ if (gfds_size_max / 2 < n_gfds)
+ memory_full (SIZE_MAX);
+ size = 2 * n_gfds;
+ gfds_size = 0;
xfree (gfds);
- gfds = xmalloc (sizeof (*gfds) * gfds_size);
+ gfds = xmalloc (sizeof *gfds * size);
+ gfds_size = size;
}
n_gfds = g_main_context_query (context,
=== modified file 'src/xrdb.c'
--- src/xrdb.c 2011-07-10 08:20:10 +0000
+++ src/xrdb.c 2011-07-29 01:59:57 +0000
@@ -204,7 +204,10 @@
if (path_size - path_len <= next_len)
{
if (min (PTRDIFF_MAX, SIZE_MAX) / 2 - 1 - path_len < next_len)
- memory_full (SIZE_MAX);
+ {
+ xfree (path);
+ memory_full (SIZE_MAX);
+ }
path_size = (path_len + next_len + 1) * 2;
path = (char *) xrealloc (path, path_size);
}
@@ -426,24 +429,22 @@
{
XrmDatabase db;
char *p;
- char *path = 0, *home = 0;
- const char *host;
+ char *path = 0;
if ((p = getenv ("XENVIRONMENT")) == NULL)
{
- home = gethomedir ();
- host = get_system_name ();
- path = (char *) xmalloc (strlen (home)
- + sizeof (".Xdefaults-")
- + strlen (host));
- sprintf (path, "%s%s%s", home, ".Xdefaults-", host);
+ static char const xdefaults[] = ".Xdefaults-";
+ char *home = gethomedir ();
+ char const *host = get_system_name ();
+ ptrdiff_t pathsize = strlen (home) + sizeof xdefaults + strlen (host);
+ path = (char *) xrealloc (home, pathsize);
+ strcat (strcat (path, xdefaults), host);
p = path;
}
db = XrmGetFileDatabase (p);
xfree (path);
- xfree (home);
return db;
}
=== modified file 'src/xselect.c'
--- src/xselect.c 2011-07-13 03:45:56 +0000
+++ src/xselect.c 2011-07-29 05:08:30 +0000
@@ -66,22 +66,15 @@
static void wait_for_property_change (struct prop_location *);
static Lisp_Object x_get_foreign_selection (Lisp_Object, Lisp_Object,
Lisp_Object, Lisp_Object);
-static void x_get_window_property (Display *, Window, Atom,
- unsigned char **, int *,
- Atom *, int *, unsigned long *, int);
-static void receive_incremental_selection (Display *, Window, Atom,
- Lisp_Object, unsigned,
- unsigned char **, int *,
- Atom *, int *, unsigned long *);
static Lisp_Object x_get_window_property_as_lisp_data (Display *,
Window, Atom,
Lisp_Object, Atom);
static Lisp_Object selection_data_to_lisp_data (Display *,
const unsigned char *,
- int, Atom, int);
+ ptrdiff_t, Atom, int);
static void lisp_data_to_selection_data (Display *, Lisp_Object,
unsigned char **, Atom *,
- unsigned *, int *, int *);
+ ptrdiff_t *, int *, int *);
static Lisp_Object clean_local_selection_data (Lisp_Object);
/* Printing traces to stderr. */
@@ -114,15 +107,37 @@
static Lisp_Object Qforeign_selection;
static Lisp_Object Qx_lost_selection_functions, Qx_sent_selection_functions;
+/* Bytes needed to represent 'long' data. This is as per libX11; it
+ is not necessarily sizeof (long). */
+#define X_LONG_SIZE 4
+
+/* Maximum unsigned 'short' and 'long' values suitable for libX11. */
+#define X_USHRT_MAX 0xffff
+#define X_ULONG_MAX 0xffffffff
+
/* If this is a smaller number than the max-request-size of the display,
emacs will use INCR selection transfer when the selection is larger
than this. The max-request-size is usually around 64k, so if you want
emacs to use incremental selection transfers when the selection is
smaller than that, set this. I added this mostly for debugging the
- incremental transfer stuff, but it might improve server performance. */
-#define MAX_SELECTION_QUANTUM 0xFFFFFF
-
-#define SELECTION_QUANTUM(dpy) ((XMaxRequestSize(dpy) << 2) - 100)
+ incremental transfer stuff, but it might improve server performance.
+
+ This value cannot exceed INT_MAX / max (X_LONG_SIZE, sizeof (long))
+ because it is multiplied by X_LONG_SIZE and by sizeof (long) in
+ subscript calculations. Similarly for PTRDIFF_MAX - 1 or SIZE_MAX
+ - 1 in place of INT_MAX. */
+#define MAX_SELECTION_QUANTUM \
+ ((int) min (0xFFFFFF, (min (INT_MAX, min (PTRDIFF_MAX, SIZE_MAX) - 1)
\
+ / max (X_LONG_SIZE, sizeof (long)))))
+
+static int
+selection_quantum (Display *display)
+{
+ long mrs = XMaxRequestSize (display);
+ return (mrs < MAX_SELECTION_QUANTUM / X_LONG_SIZE + 25
+ ? (mrs - 25) * X_LONG_SIZE
+ : MAX_SELECTION_QUANTUM);
+}
#define LOCAL_SELECTION(selection_symbol,dpyinfo) \
assq_no_quit (selection_symbol, dpyinfo->terminal->Vselection_alist)
@@ -477,7 +492,7 @@
struct selection_data
{
unsigned char *data;
- unsigned int size;
+ ptrdiff_t size;
int format;
Atom type;
int nofree;
@@ -581,14 +596,11 @@
XSelectionEvent *reply = &(reply_base.xselection);
Display *display = SELECTION_EVENT_DISPLAY (event);
Window window = SELECTION_EVENT_REQUESTOR (event);
- int bytes_remaining;
- int max_bytes = SELECTION_QUANTUM (display);
+ ptrdiff_t bytes_remaining;
+ int max_bytes = selection_quantum (display);
int count = SPECPDL_INDEX ();
struct selection_data *cs;
- if (max_bytes > MAX_SELECTION_QUANTUM)
- max_bytes = MAX_SELECTION_QUANTUM;
-
reply->type = SelectionNotify;
reply->display = display;
reply->requestor = window;
@@ -616,11 +628,12 @@
if (cs->property == None)
continue;
- bytes_remaining = cs->size * (cs->format / 8);
+ bytes_remaining = cs->size;
+ bytes_remaining *= cs->format >> 3;
if (bytes_remaining <= max_bytes)
{
/* Send all the data at once, with minimal handshaking. */
- TRACE1 ("Sending all %d bytes", bytes_remaining);
+ TRACE1 ("Sending all %"pD"d bytes", bytes_remaining);
XChangeProperty (display, window, cs->property,
cs->type, cs->format, PropModeReplace,
cs->data, cs->size);
@@ -628,9 +641,9 @@
else
{
/* Send an INCR tag to initiate incremental transfer. */
- long value[1];
+ unsigned long value[1];
- TRACE2 ("Start sending %d bytes incrementally (%s)",
+ TRACE2 ("Start sending %"pD"d bytes incrementally (%s)",
bytes_remaining, XGetAtomName (display, cs->property));
cs->wait_object
= expect_property_change (display, window, cs->property,
@@ -638,7 +651,7 @@
/* XChangeProperty expects an array of long even if long is
more than 32 bits. */
- value[0] = bytes_remaining;
+ value[0] = min (bytes_remaining, X_ULONG_MAX);
XChangeProperty (display, window, cs->property,
dpyinfo->Xatom_INCR, 32, PropModeReplace,
(unsigned char *) value, 1);
@@ -672,7 +685,8 @@
int had_errors = x_had_errors_p (display);
UNBLOCK_INPUT;
- bytes_remaining = cs->size * format_bytes;
+ bytes_remaining = cs->size;
+ bytes_remaining *= format_bytes;
/* Wait for the requester to ack by deleting the property.
This can run Lisp code (process handlers) or signal. */
@@ -810,7 +824,7 @@
non-None property. */
Window requestor = SELECTION_EVENT_REQUESTOR (event);
Lisp_Object multprop;
- int j, nselections;
+ ptrdiff_t j, nselections;
if (property == None) goto DONE;
multprop
@@ -1269,19 +1283,28 @@
static void
x_get_window_property (Display *display, Window window, Atom property,
- unsigned char **data_ret, int *bytes_ret,
+ unsigned char **data_ret, ptrdiff_t *bytes_ret,
Atom *actual_type_ret, int *actual_format_ret,
unsigned long *actual_size_ret, int delete_p)
{
- int total_size;
+ ptrdiff_t total_size;
unsigned long bytes_remaining;
- int offset = 0;
+ ptrdiff_t offset = 0;
+ unsigned char *data = 0;
unsigned char *tmp_data = 0;
int result;
- int buffer_size = SELECTION_QUANTUM (display);
-
- if (buffer_size > MAX_SELECTION_QUANTUM)
- buffer_size = MAX_SELECTION_QUANTUM;
+ int buffer_size = selection_quantum (display);
+
+ /* Wide enough to avoid overflow in expressions using it. */
+ ptrdiff_t x_long_size = X_LONG_SIZE;
+
+ /* Maximum value for TOTAL_SIZE. It cannot exceed PTRDIFF_MAX - 1
+ and SIZE_MAX - 1, for an extra byte at the end. And it cannot
+ exceed LONG_MAX * X_LONG_SIZE, for XGetWindowProperty. */
+ ptrdiff_t total_size_max =
+ ((min (PTRDIFF_MAX, SIZE_MAX) - 1) / x_long_size < LONG_MAX
+ ? min (PTRDIFF_MAX, SIZE_MAX) - 1
+ : LONG_MAX * x_long_size);
BLOCK_INPUT;
@@ -1292,49 +1315,44 @@
actual_size_ret,
&bytes_remaining, &tmp_data);
if (result != Success)
- {
- UNBLOCK_INPUT;
- *data_ret = 0;
- *bytes_ret = 0;
- return;
- }
+ goto done;
/* This was allocated by Xlib, so use XFree. */
XFree ((char *) tmp_data);
if (*actual_type_ret == None || *actual_format_ret == 0)
- {
- UNBLOCK_INPUT;
- return;
- }
+ goto done;
- total_size = bytes_remaining + 1;
- *data_ret = (unsigned char *) xmalloc (total_size);
+ if (total_size_max < bytes_remaining)
+ goto size_overflow;
+ total_size = bytes_remaining;
+ data = malloc (total_size + 1);
+ if (! data)
+ goto memory_exhausted;
/* Now read, until we've gotten it all. */
while (bytes_remaining)
{
-#ifdef TRACE_SELECTION
- unsigned long last = bytes_remaining;
-#endif
+ ptrdiff_t bytes_gotten;
+ int bytes_per_item;
result
= XGetWindowProperty (display, window, property,
- (long)offset/4, (long)buffer_size/4,
+ offset / X_LONG_SIZE,
+ buffer_size / X_LONG_SIZE,
False,
AnyPropertyType,
actual_type_ret, actual_format_ret,
actual_size_ret, &bytes_remaining, &tmp_data);
- TRACE2 ("Read %lu bytes from property %s",
- last - bytes_remaining,
- XGetAtomName (display, property));
-
/* If this doesn't return Success at this point, it means that
some clod deleted the selection while we were in the midst of
reading it. Deal with that, I guess.... */
if (result != Success)
break;
+ bytes_per_item = *actual_format_ret >> 3;
+ xassert (*actual_size_ret <= buffer_size / bytes_per_item);
+
/* The man page for XGetWindowProperty says:
"If the returned format is 32, the returned data is represented
as a long array and should be cast to that type to obtain the
@@ -1348,32 +1366,61 @@
The bytes and offsets passed to XGetWindowProperty refers to the
property and those are indeed in 32 bit quantities if format is 32.
*/
+ bytes_gotten = *actual_size_ret;
+ bytes_gotten *= bytes_per_item;
+
+ TRACE2 ("Read %"pD"d bytes from property %s",
+ bytes_gotten, XGetAtomName (display, property));
+
+ if (total_size - offset < bytes_gotten)
+ {
+ unsigned char *data1;
+ ptrdiff_t remaining_lim = total_size_max - offset - bytes_gotten;
+ if (remaining_lim < 0 || remaining_lim < bytes_remaining)
+ goto size_overflow;
+ total_size = offset + bytes_gotten + bytes_remaining;
+ data1 = realloc (data, total_size + 1);
+ if (! data1)
+ goto memory_exhausted;
+ data = data1;
+ }
+
if (32 < BITS_PER_LONG && *actual_format_ret == 32)
{
unsigned long i;
- int *idata = (int *) ((*data_ret) + offset);
+ int *idata = (int *) (data + offset);
long *ldata = (long *) tmp_data;
for (i = 0; i < *actual_size_ret; ++i)
- {
- idata[i]= (int) ldata[i];
- offset += 4;
- }
+ idata[i] = ldata[i];
}
else
- {
- *actual_size_ret *= *actual_format_ret / 8;
- memcpy ((*data_ret) + offset, tmp_data, *actual_size_ret);
- offset += *actual_size_ret;
- }
+ memcpy (data + offset, tmp_data, bytes_gotten);
+
+ offset += bytes_gotten;
/* This was allocated by Xlib, so use XFree. */
XFree ((char *) tmp_data);
}
XFlush (display);
+ data[offset] = '\0';
+
+ done:
UNBLOCK_INPUT;
+ *data_ret = data;
*bytes_ret = offset;
+ return;
+
+ size_overflow:
+ free (data);
+ UNBLOCK_INPUT;
+ memory_full (SIZE_MAX);
+
+ memory_exhausted:
+ free (data);
+ UNBLOCK_INPUT;
+ memory_full (total_size + 1);
}
/* Use xfree, not XFree, to free the data obtained with this function. */
@@ -1382,16 +1429,19 @@
receive_incremental_selection (Display *display, Window window, Atom property,
Lisp_Object target_type,
unsigned int min_size_bytes,
- unsigned char **data_ret, int *size_bytes_ret,
+ unsigned char **data_ret,
+ ptrdiff_t *size_bytes_ret,
Atom *type_ret, int *format_ret,
unsigned long *size_ret)
{
- int offset = 0;
+ ptrdiff_t offset = 0;
struct prop_location *wait_object;
+ if (min (PTRDIFF_MAX, SIZE_MAX) < min_size_bytes)
+ memory_full (SIZE_MAX);
+ *data_ret = (unsigned char *) xmalloc (min_size_bytes);
*size_bytes_ret = min_size_bytes;
- *data_ret = (unsigned char *) xmalloc (*size_bytes_ret);
- TRACE1 ("Read %d bytes incrementally", min_size_bytes);
+ TRACE1 ("Read %u bytes incrementally", min_size_bytes);
/* At this point, we have read an INCR property.
Delete the property to ack it.
@@ -1416,7 +1466,7 @@
while (1)
{
unsigned char *tmp_data;
- int tmp_size_bytes;
+ ptrdiff_t tmp_size_bytes;
TRACE0 (" Wait for property change");
wait_for_property_change (wait_object);
@@ -1429,7 +1479,7 @@
&tmp_data, &tmp_size_bytes,
type_ret, format_ret, size_ret, 1);
- TRACE1 (" Read increment of %d bytes", tmp_size_bytes);
+ TRACE1 (" Read increment of %"pD"d bytes", tmp_size_bytes);
if (tmp_size_bytes == 0) /* we're done */
{
@@ -1452,10 +1502,17 @@
XFlush (display);
UNBLOCK_INPUT;
- if (*size_bytes_ret < offset + tmp_size_bytes)
+ if (*size_bytes_ret - offset < tmp_size_bytes)
{
- *size_bytes_ret = offset + tmp_size_bytes;
- *data_ret = (unsigned char *) xrealloc (*data_ret, *size_bytes_ret);
+ ptrdiff_t size;
+ if (min (PTRDIFF_MAX, SIZE_MAX) - offset < tmp_size_bytes)
+ {
+ xfree (tmp_data);
+ memory_full (SIZE_MAX);
+ }
+ size = offset + tmp_size_bytes;
+ *data_ret = (unsigned char *) xrealloc (*data_ret, size);
+ *size_bytes_ret = size;
}
memcpy ((*data_ret) + offset, tmp_data, tmp_size_bytes);
@@ -1482,7 +1539,7 @@
int actual_format;
unsigned long actual_size;
unsigned char *data = 0;
- int bytes = 0;
+ ptrdiff_t bytes = 0;
Lisp_Object val;
struct x_display_info *dpyinfo = x_display_info_for_display (display);
@@ -1574,7 +1631,7 @@
static Lisp_Object
selection_data_to_lisp_data (Display *display, const unsigned char *data,
- int size, Atom type, int format)
+ ptrdiff_t size, Atom type, int format)
{
struct x_display_info *dpyinfo = x_display_info_for_display (display);
@@ -1607,7 +1664,7 @@
/* Treat ATOM_PAIR type similar to list of atoms. */
|| type == dpyinfo->Xatom_ATOM_PAIR)
{
- int i;
+ ptrdiff_t i;
/* On a 64 bit machine sizeof(Atom) == sizeof(long) == 8.
But the callers of these function has made sure the data for
format == 32 is an array of int. Thus, use int instead
@@ -1634,28 +1691,29 @@
else if (format == 32 && size == sizeof (int))
return INTEGER_TO_CONS (((unsigned int *) data) [0]);
else if (format == 16 && size == sizeof (short))
- return make_number ((int) (((unsigned short *) data) [0]));
+ return make_number (((unsigned short *) data) [0]);
/* Convert any other kind of data to a vector of numbers, represented
as above (as an integer, or a cons of two 16 bit integers.)
*/
else if (format == 16)
{
- int i;
+ ptrdiff_t i;
Lisp_Object v;
v = Fmake_vector (make_number (size / 2), make_number (0));
for (i = 0; i < size / 2; i++)
{
- int j = (int) ((unsigned short *) data) [i];
+ EMACS_INT j = ((unsigned short *) data) [i];
Faset (v, make_number (i), make_number (j));
}
return v;
}
else
{
- int i;
- Lisp_Object v = Fmake_vector (make_number (size / 4), make_number (0));
- for (i = 0; i < size / 4; i++)
+ ptrdiff_t i;
+ Lisp_Object v = Fmake_vector (make_number (size / X_LONG_SIZE),
+ make_number (0));
+ for (i = 0; i < size / X_LONG_SIZE; i++)
{
unsigned int j = ((unsigned int *) data) [i];
Faset (v, make_number (i), INTEGER_TO_CONS (j));
@@ -1670,7 +1728,7 @@
static void
lisp_data_to_selection_data (Display *display, Lisp_Object obj,
unsigned char **data_ret, Atom *type_ret,
- unsigned int *size_ret,
+ ptrdiff_t *size_ret,
int *format_ret, int *nofree_ret)
{
Lisp_Object type = Qnil;
@@ -1707,22 +1765,20 @@
}
else if (SYMBOLP (obj))
{
- *format_ret = 32;
- *size_ret = 1;
*data_ret = (unsigned char *) xmalloc (sizeof (Atom) + 1);
+ *format_ret = 32;
+ *size_ret = 1;
(*data_ret) [sizeof (Atom)] = 0;
(*(Atom **) data_ret) [0] = symbol_to_x_atom (dpyinfo, obj);
if (NILP (type)) type = QATOM;
}
- else if (INTEGERP (obj)
- && XINT (obj) < 0xFFFF
- && XINT (obj) > -0xFFFF)
+ else if (RANGED_INTEGERP (0, obj, X_USHRT_MAX))
{
+ *data_ret = (unsigned char *) xmalloc (sizeof (short) + 1);
*format_ret = 16;
*size_ret = 1;
- *data_ret = (unsigned char *) xmalloc (sizeof (short) + 1);
(*data_ret) [sizeof (short)] = 0;
- (*(short **) data_ret) [0] = (short) XINT (obj);
+ (*(unsigned short **) data_ret) [0] = XINT (obj);
if (NILP (type)) type = QINTEGER;
}
else if (INTEGERP (obj)
@@ -1731,11 +1787,11 @@
|| (CONSP (XCDR (obj))
&& INTEGERP (XCAR (XCDR (obj)))))))
{
- *format_ret = 32;
- *size_ret = 1;
*data_ret = (unsigned char *) xmalloc (sizeof (long) + 1);
+ *format_ret = 32;
+ *size_ret = 1;
(*data_ret) [sizeof (long)] = 0;
- (*(unsigned long **) data_ret) [0] = cons_to_unsigned (obj, ULONG_MAX);
+ (*(unsigned long **) data_ret) [0] = cons_to_unsigned (obj, X_ULONG_MAX);
if (NILP (type)) type = QINTEGER;
}
else if (VECTORP (obj))
@@ -1744,50 +1800,54 @@
a set of 16 or 32 bit INTEGERs;
or a set of ATOM_PAIRs (represented as [[A1 A2] [A3 A4] ...]
*/
- int i;
+ ptrdiff_t i;
+ ptrdiff_t size = ASIZE (obj);
if (SYMBOLP (XVECTOR (obj)->contents [0]))
/* This vector is an ATOM set */
{
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (Atom) < size)
+ memory_full (SIZE_MAX);
if (NILP (type)) type = QATOM;
- *size_ret = ASIZE (obj);
- *format_ret = 32;
- for (i = 0; i < *size_ret; i++)
+ for (i = 0; i < size; i++)
if (!SYMBOLP (XVECTOR (obj)->contents [i]))
signal_error ("All elements of selection vector must have same
type", obj);
- *data_ret = (unsigned char *) xmalloc ((*size_ret) * sizeof (Atom));
- for (i = 0; i < *size_ret; i++)
+ *data_ret = (unsigned char *) xmalloc (size * sizeof (Atom));
+ *format_ret = 32;
+ *size_ret = size;
+ for (i = 0; i < size; i++)
(*(Atom **) data_ret) [i]
= symbol_to_x_atom (dpyinfo, XVECTOR (obj)->contents [i]);
}
else
/* This vector is an INTEGER set, or something like it */
{
+ int format = 16;
int data_size = 2;
- *size_ret = ASIZE (obj);
if (NILP (type)) type = QINTEGER;
- *format_ret = 16;
- for (i = 0; i < *size_ret; i++)
- if (CONSP (XVECTOR (obj)->contents [i]))
- *format_ret = 32;
- else if (!INTEGERP (XVECTOR (obj)->contents [i]))
- signal_error (/* Qselection_error */
- "Elements of selection vector must be integers or conses of integers",
- obj);
-
- /* Use sizeof(long) even if it is more than 32 bits. See comment
- in x_get_window_property and x_fill_property_data. */
-
- if (*format_ret == 32) data_size = sizeof(long);
- *data_ret = (unsigned char *) xmalloc (*size_ret * data_size);
- for (i = 0; i < *size_ret; i++)
- if (*format_ret == 32)
+ for (i = 0; i < size; i++)
+ if (X_USHRT_MAX
+ < cons_to_unsigned (XVECTOR (obj)->contents[i], X_ULONG_MAX))
+ {
+ /* Use sizeof (long) even if it is more than 32 bits.
+ See comment in x_get_window_property and
+ x_fill_property_data. */
+ data_size = sizeof (long);
+ format = 32;
+ }
+ if (min (PTRDIFF_MAX, SIZE_MAX) / data_size < size)
+ memory_full (SIZE_MAX);
+ *data_ret = (unsigned char *) xmalloc (size * data_size);
+ *format_ret = format;
+ *size_ret = size;
+ for (i = 0; i < size; i++)
+ if (format == 32)
(*((unsigned long **) data_ret)) [i] =
- cons_to_unsigned (XVECTOR (obj)->contents [i], ULONG_MAX);
+ cons_to_unsigned (XVECTOR (obj)->contents[i], X_ULONG_MAX);
else
(*((unsigned short **) data_ret)) [i] =
- cons_to_unsigned (XVECTOR (obj)->contents [i], USHRT_MAX);
+ cons_to_unsigned (XVECTOR (obj)->contents[i], X_USHRT_MAX);
}
}
else
@@ -1817,8 +1877,8 @@
}
if (VECTORP (obj))
{
- int i;
- int size = ASIZE (obj);
+ ptrdiff_t i;
+ ptrdiff_t size = ASIZE (obj);
Lisp_Object copy;
if (size == 1)
return clean_local_selection_data (XVECTOR (obj)->contents [0]);
@@ -2213,6 +2273,8 @@
else if (CONSP (o) &&
(! NUMBERP (XCAR (o)) || ! NUMBERP (XCDR (o))))
return -1;
+ if (size == INT_MAX)
+ return -1;
size++;
}
@@ -2294,8 +2356,11 @@
x_property_data_to_lisp (struct frame *f, const unsigned char *data,
Atom type, int format, long unsigned int size)
{
+ ptrdiff_t format_bytes = format >> 3;
+ if (PTRDIFF_MAX / format_bytes < size)
+ memory_full (SIZE_MAX);
return selection_data_to_lisp_data (FRAME_X_DISPLAY (f),
- data, size*format/8, type, format);
+ data, size * format_bytes, type, format);
}
/* Get the mouse position in frame relative coordinates. */
@@ -2405,10 +2470,10 @@
if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *dpyinfo->x_dnd_atoms / 2
< dpyinfo->x_dnd_atoms_size)
memory_full (SIZE_MAX);
+ dpyinfo->x_dnd_atoms = xrealloc (dpyinfo->x_dnd_atoms,
+ (2 * sizeof *dpyinfo->x_dnd_atoms
+ * dpyinfo->x_dnd_atoms_size));
dpyinfo->x_dnd_atoms_size *= 2;
- dpyinfo->x_dnd_atoms = xrealloc (dpyinfo->x_dnd_atoms,
- sizeof (*dpyinfo->x_dnd_atoms)
- * dpyinfo->x_dnd_atoms_size);
}
dpyinfo->x_dnd_atoms[dpyinfo->x_dnd_atoms_length++] = x_atom;
@@ -2426,7 +2491,7 @@
unsigned long size = 160/event->format;
int x, y;
unsigned char *data = (unsigned char *) event->data.b;
- int idata[5];
+ unsigned int idata[5];
ptrdiff_t i;
for (i = 0; i < dpyinfo->x_dnd_atoms_length; ++i)
@@ -2444,7 +2509,7 @@
if (32 < BITS_PER_LONG && event->format == 32)
{
for (i = 0; i < 5; ++i) /* There are only 5 longs in a ClientMessage. */
- idata[i] = (int) event->data.l[i];
+ idata[i] = event->data.l[i];
data = (unsigned char *) idata;
}
=== modified file 'src/xsmfns.c'
--- src/xsmfns.c 2011-06-21 20:32:19 +0000
+++ src/xsmfns.c 2011-07-29 05:09:32 +0000
@@ -223,6 +223,9 @@
props[props_idx]->name = xstrdup (SmRestartCommand);
props[props_idx]->type = xstrdup (SmLISTofARRAY8);
/* /path/to/emacs, --smid=xxx --no-splash --chdir=dir ... */
+ if (min (INT_MAX, min (PTRDIFF_MAX, SIZE_MAX) / sizeof *vp) - 3
+ < initial_argc)
+ memory_full (SIZE_MAX);
i = 3 + initial_argc;
props[props_idx]->num_vals = i;
vp = (SmPropValue *) xmalloc (i * sizeof(*vp));
=== modified file 'src/xterm.c'
--- src/xterm.c 2011-06-24 21:25:22 +0000
+++ src/xterm.c 2011-07-29 05:12:49 +0000
@@ -1625,19 +1625,21 @@
if (dpyinfo->color_cells == NULL)
{
Screen *screen = dpyinfo->screen;
+ int ncolor_cells = XDisplayCells (dpy, XScreenNumberOfScreen (screen));
int i;
- dpyinfo->ncolor_cells
- = XDisplayCells (dpy, XScreenNumberOfScreen (screen));
+ if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (XColor) < ncolor_cells)
+ memory_full (SIZE_MAX);
dpyinfo->color_cells
- = (XColor *) xmalloc (dpyinfo->ncolor_cells
+ = (XColor *) xmalloc (ncolor_cells
* sizeof *dpyinfo->color_cells);
+ dpyinfo->ncolor_cells = ncolor_cells;
- for (i = 0; i < dpyinfo->ncolor_cells; ++i)
+ for (i = 0; i < ncolor_cells; ++i)
dpyinfo->color_cells[i].pixel = i;
XQueryColors (dpy, dpyinfo->cmap,
- dpyinfo->color_cells, dpyinfo->ncolor_cells);
+ dpyinfo->color_cells, ncolor_cells);
}
*ncells = dpyinfo->ncolor_cells;
@@ -4190,7 +4192,7 @@
x_send_scroll_bar_event and x_scroll_bar_to_input_event. */
static struct window **scroll_bar_windows;
-static size_t scroll_bar_windows_size;
+static ptrdiff_t scroll_bar_windows_size;
/* Send a client message with message type Xatom_Scrollbar for a
@@ -4205,7 +4207,7 @@
XClientMessageEvent *ev = (XClientMessageEvent *) &event;
struct window *w = XWINDOW (window);
struct frame *f = XFRAME (w->frame);
- size_t i;
+ ptrdiff_t i;
BLOCK_INPUT;
@@ -4226,12 +4228,16 @@
if (i == scroll_bar_windows_size)
{
- size_t new_size = max (10, 2 * scroll_bar_windows_size);
- size_t nbytes = new_size * sizeof *scroll_bar_windows;
- size_t old_nbytes = scroll_bar_windows_size * sizeof *scroll_bar_windows;
-
- if ((size_t) -1 / sizeof *scroll_bar_windows < new_size)
+ ptrdiff_t new_size, old_nbytes, nbytes;
+ /* Check the 32-bit XClientMessageEvent limit, as well as the
+ usual ptrdiff_t/size_t limit. */
+ if (min (0x7fffffff,
+ min (PTRDIFF_MAX, SIZE_MAX) / sizeof *scroll_bar_windows / 2)
+ < scroll_bar_windows_size)
memory_full (SIZE_MAX);
+ new_size = max (10, 2 * scroll_bar_windows_size);
+ nbytes = new_size * sizeof *scroll_bar_windows;
+ old_nbytes = scroll_bar_windows_size * sizeof *scroll_bar_windows;
scroll_bar_windows = (struct window **) xrealloc (scroll_bar_windows,
nbytes);
memset (&scroll_bar_windows[i], 0, nbytes - old_nbytes);
@@ -5813,7 +5819,7 @@
} inev;
int count = 0;
int do_help = 0;
- int nbytes = 0;
+ ptrdiff_t nbytes = 0;
struct frame *f = NULL;
struct coding_system coding;
XEvent event = *eventptr;
@@ -6511,7 +6517,7 @@
}
{ /* Raw bytes, not keysym. */
- register int i;
+ ptrdiff_t i;
int nchars, len;
for (i = 0, nchars = 0; i < nbytes; i++)
@@ -6524,7 +6530,11 @@
if (nchars < nbytes)
{
/* Decode the input data. */
- int require;
+ ptrdiff_t require;
+
+ if (min (PTRDIFF_MAX, SIZE_MAX) / MAX_MULTIBYTE_LENGTH
+ < nbytes)
+ memory_full (SIZE_MAX);
/* The input should be decoded with `coding_system'
which depends on which X*LookupString function
@@ -9822,6 +9832,7 @@
struct x_display_info *dpyinfo;
XrmDatabase xrdb;
Mouse_HLInfo *hlinfo;
+ ptrdiff_t lim;
BLOCK_INPUT;
@@ -10040,12 +10051,15 @@
XSetAfterFunction (x_current_display, x_trace_wire);
#endif /* ! 0 */
+ lim = min (PTRDIFF_MAX, SIZE_MAX) - sizeof "@";
+ if (lim - SBYTES (Vinvocation_name) < SBYTES (Vsystem_name))
+ memory_full (SIZE_MAX);
dpyinfo->x_id_name
= (char *) xmalloc (SBYTES (Vinvocation_name)
+ SBYTES (Vsystem_name)
+ 2);
- sprintf (dpyinfo->x_id_name, "%s@%s",
- SSDATA (Vinvocation_name), SSDATA (Vsystem_name));
+ strcat (strcat (strcpy (dpyinfo->x_id_name, SSDATA (Vinvocation_name)), "@"),
+ SSDATA (Vsystem_name));
/* Figure out which modifier bits mean what. */
x_find_modifier_meanings (dpyinfo);
# Begin bundle
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
- bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs),
Paul Eggert <=
- bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs), Jan Djärv, 2011/07/29
- bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs), Paul Eggert, 2011/07/29
- bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs), Jan Djärv, 2011/07/29
- bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs), Paul Eggert, 2011/07/29
- bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs), Jan Djärv, 2011/07/30
- bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs), Paul Eggert, 2011/07/30
- bug#9196: integer and memory overflow issues (e.g., cut-and-paste crashes Emacs), Jan Djärv, 2011/07/31