From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 22 Nov 2010 00:43:53 +0000 (-0500)
Subject: * alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301).
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~161
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b609f5916da6c2fc66864b390e05e807d85ea88f;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 44dc63fd424..d9aad77fc7c 100644
--- 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 6e121212b14..28636ec776c 100644
--- 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)
     {