[Emacs-diffs] /srv/bzr/emacs/trunk r102470: * alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301).

[Chong Yidong]

------------------------------------------------------------
revno: 102470
author: YAMAMOTO Mitsuharu <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-11-21 19:43:53 -0500
message:
  * alloc.c (mark_maybe_object): Return early if given a Lisp integer 
(Bug#6301).
modified:
  src/ChangeLog
  src/alloc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-21 15:46:23 +0000
+++ b/src/ChangeLog     2010-11-22 00:43:53 +0000
@@ -1,3 +1,8 @@
+2010-11-22  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * alloc.c (mark_maybe_object): Return early if given a Lisp
+       integer (Bug#6301).
+
 2010-11-21  Ken Brown  <address@hidden>
 
        * sheap.c (STATIC_HEAP_SIZE): Revert previous change.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2010-11-18 21:45:03 +0000
+++ b/src/alloc.c       2010-11-22 00:43:53 +0000
@@ -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)
     {