* alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301).

diff --git a/src/ChangeLog b/src/ChangeLog
index 44dc63fd424c2a69ee6ce029b6ba9a288c5c5ad7..d9aad77fc7cba4fc65ad37cc1fd62561ffcb2fd0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/alloc.c b/src/alloc.c
index 6e121212b1437356f6144b8493050eeba940486c..28636ec776c54668694e42c6aee960babe9799a5 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3986,8 +3986,14 @@ DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "",
 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)
     {