1 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e2b1b294968..c747a325139 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,9 @@
        * alloc.c (Fmake_bool_vector): Don't assume vector size fits in int.
        (allocate_vectorlike): Check for ptrdiff_t overflow.
+        (mark_vectorlike, mark_char_table, mark_object): Avoid EMACS_UINT
+        when a (possibly-narrower) signed value would do just as well.
+        We prefer using signed arithmetic, to avoid comparison confusion.
        * alloc.c: Catch some string size overflows that we were missing.
        (XMALLOC_OVERRUN_CHECK_SIZE) [!XMALLOC_OVERRUN_CHECK]: Define to 0,

diff --git a/src/ChangeLog b/src/ChangeLog index e2b1b294968..c747a325139 100644 --- a/src/ChangeLog +++ b/src/ChangeLog
@@ -2,6 +2,9 @@
2		2
3	* alloc.c (Fmake_bool_vector): Don't assume vector size fits in int.	3	* alloc.c (Fmake_bool_vector): Don't assume vector size fits in int.
4	(allocate_vectorlike): Check for ptrdiff_t overflow.	4	(allocate_vectorlike): Check for ptrdiff_t overflow.
		5	(mark_vectorlike, mark_char_table, mark_object): Avoid EMACS_UINT
		6	when a (possibly-narrower) signed value would do just as well.
		7	We prefer using signed arithmetic, to avoid comparison confusion.
5		8
6	* alloc.c: Catch some string size overflows that we were missing.	9	* alloc.c: Catch some string size overflows that we were missing.
7	(XMALLOC_OVERRUN_CHECK_SIZE) [!XMALLOC_OVERRUN_CHECK]: Define to 0,	10	(XMALLOC_OVERRUN_CHECK_SIZE) [!XMALLOC_OVERRUN_CHECK]: Define to 0,