aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-09-23 14:54:49 -0400
committerEli Zaretskii2010-09-23 14:54:49 -0400
commit6e48267a3d22e02ffa51e0c627b841628812f89c (patch)
tree365fe7ca16b300b5a3ba90d034f4ac849a4b64d0 /src
parentc50bd0d27811d4a742309c004d1e6c9f2184885e (diff)
downloademacs-6e48267a3d22e02ffa51e0c627b841628812f89c.tar.gz
emacs-6e48267a3d22e02ffa51e0c627b841628812f89c.zip
Use EMACS_INT instead of EMACS_UINT in intervals.c.
The latter causes crashes, since LENGTH macro in intervals.h:114 has to be able to return a negative number.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/intervals.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d83a4fbed17..eb6d82ee92e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -57,7 +57,7 @@
57 (move_if_not_intangible, get_local_map, copy_intervals) 57 (move_if_not_intangible, get_local_map, copy_intervals)
58 (copy_intervals_to_string, compare_string_intervals) 58 (copy_intervals_to_string, compare_string_intervals)
59 (set_intervals_multibyte_1): Use EMACS_INT for buffer positions 59 (set_intervals_multibyte_1): Use EMACS_INT for buffer positions
60 and EMACS_UINT for interval tree size. 60 and for interval tree size.
61 61
62 * intervals.h (traverse_intervals, split_interval_right) 62 * intervals.h (traverse_intervals, split_interval_right)
63 (split_interval_left, find_interval, offset_intervals) 63 (split_interval_left, find_interval, offset_intervals)
diff --git a/src/intervals.c b/src/intervals.c
index b3fd1ea4e08..421cce76db2 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1326,8 +1326,8 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from,
1326 if (relative_position < LEFT_TOTAL_LENGTH (tree)) 1326 if (relative_position < LEFT_TOTAL_LENGTH (tree))
1327 { 1327 {
1328 EMACS_INT subtract = interval_deletion_adjustment (tree->left, 1328 EMACS_INT subtract = interval_deletion_adjustment (tree->left,
1329 relative_position, 1329 relative_position,
1330 amount); 1330 amount);
1331 tree->total_length -= subtract; 1331 tree->total_length -= subtract;
1332 CHECK_TOTAL_LENGTH (tree); 1332 CHECK_TOTAL_LENGTH (tree);
1333 return subtract; 1333 return subtract;