1 files changed, 4 insertions, 0 deletions

diff --git a/src/textprop.c b/src/textprop.c
index 87fa6742919..a268afba830 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1787,8 +1787,12 @@ text_property_stickiness (prop, pos, buffer)
         /* PROP is rear-non-sticky.  */
         is_rear_sticky = 0;
     }
+  else
+    return 0;
 
   /* Consider following character.  */
+  /* This signals an arg-out-of-range error if pos is outside the
+     buffer's accessible range.  */
   front_sticky = Fget_text_property (pos, Qfront_sticky, buffer);
 
   if (EQ (front_sticky, Qt)