summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/composite.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/composite.c b/src/composite.c
index 440bce3b41f..085458db521 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -475,6 +475,10 @@ update_compositions (from, to, check_mask)
Lisp_Object prop, hook;
int start, end;
+ /* If FROM and TO are not in a valid range, do nothing. */
+ if (! (BEGV <= from && from <= to && to <= ZV))
+ return;
+
if (check_mask & CHECK_HEAD)
{
/* FROM should be at composition boundary. But, insertion or