HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
855eca5
)
(Ffind_composition_internal): Check POS
author
Gerd Moellmann
<gerd@gnu.org>
Mon, 18 Jun 2001 10:41:42 +0000
(10:41 +0000)
committer
Gerd Moellmann
<gerd@gnu.org>
Mon, 18 Jun 2001 10:41:42 +0000
(10:41 +0000)
for validity.
src/composite.c
patch
|
blob
|
blame
|
history
diff --git
a/src/composite.c
b/src/composite.c
index
9ff5f85
..
6f60ddb
100644
(file)
--- a/
src/composite.c
+++ b/
src/composite.c
@@
-777,8
+777,18
@@
See `find-composition' for more detail.")
}
else
end = -1;
+
if (!NILP (string))
- CHECK_STRING (string, 2);
+ {
+ CHECK_STRING (string, 2);
+ if (XINT (pos) < 0 || XINT (pos) >= XSTRING (string)->size)
+ args_out_of_range (string, pos);
+ }
+ else
+ {
+ if (XINT (pos) < BEGV || XINT (pos) >= ZV)
+ args_out_of_range (Fcurrent_buffer (), pos);
+ }
if (!find_composition (start, end, &start, &end, &prop, string))
return Qnil;