Mercurial > emacs
changeset 111670:f736e5e4fef4
* alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 21 Nov 2010 19:43:53 -0500 |
| parents | ed117caa918e |
| children | a608fdf9cdc5 |
| files | src/ChangeLog src/alloc.c |
| diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 21 22:46:16 2010 +0000 +++ b/src/ChangeLog Sun Nov 21 19:43:53 2010 -0500 @@ -1,3 +1,8 @@ +2010-11-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * alloc.c (mark_maybe_object): Return early if given a Lisp + integer (Bug#6301). + 2010-11-21 Ken Brown <kbrown@cornell.edu> * sheap.c (STATIC_HEAP_SIZE): Revert previous change.
--- a/src/alloc.c Sun Nov 21 22:46:16 2010 +0000 +++ b/src/alloc.c Sun Nov 21 19:43:53 2010 -0500 @@ -3986,8 +3986,14 @@ static INLINE void mark_maybe_object (Lisp_Object obj) { - void *po = (void *) XPNTR (obj); - struct mem_node *m = mem_find (po); + void *po; + struct mem_node *m; + + if (INTEGERP (obj)) + return; + + po = (void *) XPNTR (obj); + m = mem_find (po); if (m != MEM_NIL) {