1 files changed, 2 insertions, 2 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index db0515d04c5..85a7f968c95 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1903,7 +1903,7 @@ copy_part_of_rope (f, to, s, from, len, face)
   if (! FRAME_TERMCAP_P (f))
     while (n--)
       {
-        int glyph = XFASTINT (*fp);
+        int glyph = (INTEGERP (*fp) ? XFASTINT (*fp) : 0);
         int facecode;
 
         if (FAST_GLYPH_FACE (glyph) == 0)
@@ -1928,7 +1928,7 @@ copy_part_of_rope (f, to, s, from, len, face)
 #endif
     while (n--)
       {
-        if (to >= s) *to = XFASTINT (*fp);
+        if (to >= s) *to = (INTEGERP (*fp) ? XFASTINT (*fp) : 0);
         ++to;
         ++fp;
       }