diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-01-09 17:32:47 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-01-09 17:32:47 -0500 |
| commit | e398c61cb14ef89632fa28fe97b98c71695d6ccc (patch) | |
| tree | 9d0188c11c4277105eda2b82be4dcc335fd8b4fc /src/intervals.h | |
| parent | 4d9bbfa616fb135ff54a63fcd965923d48ca64f1 (diff) | |
| download | emacs-e398c61cb14ef89632fa28fe97b98c71695d6ccc.tar.gz | |
Fix bounds checking for text properties in `format' (Bug#5306).
* intervals.h, textprop.c (extend_property_ranges): Return value
and args changed. Discard properties that begin at or after the
new end (Bug#5306).
* editfns.c (Fformat): Caller changed.
Diffstat (limited to 'src/intervals.h')
| -rw-r--r-- | src/intervals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intervals.h b/src/intervals.h index d1b43ee3498..59832c9664f 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -335,7 +335,7 @@ extern void set_text_properties_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object text_property_list P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)); int add_text_properties_from_list P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -void extend_property_ranges P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); +Lisp_Object extend_property_ranges P_ ((Lisp_Object, Lisp_Object)); Lisp_Object get_char_property_and_overlay P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object*)); extern int text_property_stickiness P_ ((Lisp_Object prop, Lisp_Object pos, |