# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1290386633 18000
# Node ID f736e5e4fef434fa2d1da90ce1b2c868d1188756
# Parent  ed117caa918ef7f456be0958a3cbd657d201d04a
* alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301).

diff -r ed117caa918e -r f736e5e4fef4 src/ChangeLog
--- 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.
diff -r ed117caa918e -r f736e5e4fef4 src/alloc.c
--- 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)
     {