diff options
| author | Paul Eggert | 2011-08-04 19:15:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-08-04 19:15:35 -0700 |
| commit | 0065d05491ce5981ea20896bb26d21dcd31e6769 (patch) | |
| tree | 13240167319d4a99ab5eacae4a883258eb2d28de /src/scroll.c | |
| parent | 18ab493650d648ab8dca651ea2698861f926e895 (diff) | |
| download | emacs-0065d05491ce5981ea20896bb26d21dcd31e6769.tar.gz emacs-0065d05491ce5981ea20896bb26d21dcd31e6769.zip | |
Adjust in response to jan.h.d's comments.
See, for example <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9196#26>.
Diffstat (limited to 'src/scroll.c')
| -rw-r--r-- | src/scroll.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/scroll.c b/src/scroll.c index 9184919f0ce..05f6fdf85f0 100644 --- a/src/scroll.c +++ b/src/scroll.c | |||
| @@ -969,21 +969,14 @@ do_line_insertion_deletion_costs (FRAME_PTR frame, | |||
| 969 | const char *cleanup_string, | 969 | const char *cleanup_string, |
| 970 | int coefficient) | 970 | int coefficient) |
| 971 | { | 971 | { |
| 972 | if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof (int) < FRAME_LINES (frame)) | ||
| 973 | memory_full (SIZE_MAX); | ||
| 974 | |||
| 975 | FRAME_INSERT_COST (frame) = | 972 | FRAME_INSERT_COST (frame) = |
| 976 | (int *) xrealloc (FRAME_INSERT_COST (frame), | 973 | xnrealloc (FRAME_INSERT_COST (frame), FRAME_LINES (frame), sizeof (int)); |
| 977 | FRAME_LINES (frame) * sizeof (int)); | ||
| 978 | FRAME_DELETEN_COST (frame) = | 974 | FRAME_DELETEN_COST (frame) = |
| 979 | (int *) xrealloc (FRAME_DELETEN_COST (frame), | 975 | xnrealloc (FRAME_DELETEN_COST (frame), FRAME_LINES (frame), sizeof (int)); |
| 980 | FRAME_LINES (frame) * sizeof (int)); | ||
| 981 | FRAME_INSERTN_COST (frame) = | 976 | FRAME_INSERTN_COST (frame) = |
| 982 | (int *) xrealloc (FRAME_INSERTN_COST (frame), | 977 | xnrealloc (FRAME_INSERTN_COST (frame), FRAME_LINES (frame), sizeof (int)); |
| 983 | FRAME_LINES (frame) * sizeof (int)); | ||
| 984 | FRAME_DELETE_COST (frame) = | 978 | FRAME_DELETE_COST (frame) = |
| 985 | (int *) xrealloc (FRAME_DELETE_COST (frame), | 979 | xnrealloc (FRAME_DELETE_COST (frame), FRAME_LINES (frame), sizeof (int)); |
| 986 | FRAME_LINES (frame) * sizeof (int)); | ||
| 987 | 980 | ||
| 988 | ins_del_costs (frame, | 981 | ins_del_costs (frame, |
| 989 | ins_line_string, multi_ins_string, | 982 | ins_line_string, multi_ins_string, |