aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2010-11-21 19:43:53 -0500
committerChong Yidong2010-11-21 19:43:53 -0500
commitb609f5916da6c2fc66864b390e05e807d85ea88f (patch)
tree6f5e73ebf7698b59365493056e735ee2ed4ec8b1 /src/alloc.c
parent59e75882626e69dfe0db3578558a012a4e8227a2 (diff)
downloademacs-b609f5916da6c2fc66864b390e05e807d85ea88f.tar.gz
emacs-b609f5916da6c2fc66864b390e05e807d85ea88f.zip
* alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301).
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c10
1 files changed, 8 insertions, 2 deletions
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, "",
3986static INLINE void 3986static INLINE void
3987mark_maybe_object (Lisp_Object obj) 3987mark_maybe_object (Lisp_Object obj)
3988{ 3988{
3989 void *po = (void *) XPNTR (obj); 3989 void *po;
3990 struct mem_node *m = mem_find (po); 3990 struct mem_node *m;
3991
3992 if (INTEGERP (obj))
3993 return;
3994
3995 po = (void *) XPNTR (obj);
3996 m = mem_find (po);
3991 3997
3992 if (m != MEM_NIL) 3998 if (m != MEM_NIL)
3993 { 3999 {