aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Choi2001-01-28 15:41:57 +0000
committerAndrew Choi2001-01-28 15:41:57 +0000
commit5604ec34e4b9414637d0501f30c79a4b871008a0 (patch)
tree380d199b2bc4bb3107910ae35c756c5ed5a57d53 /src
parent8005142f86a09b989b32998a1dd0e7c7b7af53ac (diff)
downloademacs-5604ec34e4b9414637d0501f30c79a4b871008a0.tar.gz
emacs-5604ec34e4b9414637d0501f30c79a4b871008a0.zip
* fontset.c (fontset_pattern_regexp): Allocate three more bytes to
regex for '^', '$', and '\0'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/fontset.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e5987f7fcc3..614c80f8db3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12001-01-28 Andrew Choi <akochoi@i-cable.com> 12001-01-28 Andrew Choi <akochoi@i-cable.com>
2 2
3 * fontset.c (fontset_pattern_regexp): Allocate three more bytes to
4 regex for '^', '$', and '\0'.
5
3 * alloc.c (allocate_string) [macintosh]: Call check_string_bytes 6 * alloc.c (allocate_string) [macintosh]: Call check_string_bytes
4 only if current_sblock has been initialized. 7 only if current_sblock has been initialized.
5 8
diff --git a/src/fontset.c b/src/fontset.c
index 20e212f0e34..51980e69b78 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -719,7 +719,7 @@ fontset_pattern_regexp (pattern)
719 || strcmp (XSTRING (pattern)->data, CACHED_FONTSET_NAME)) 719 || strcmp (XSTRING (pattern)->data, CACHED_FONTSET_NAME))
720 { 720 {
721 /* We must at first update the cached data. */ 721 /* We must at first update the cached data. */
722 char *regex = (char *) alloca (XSTRING (pattern)->size * 2); 722 char *regex = (char *) alloca (XSTRING (pattern)->size * 2 + 3);
723 char *p0, *p1 = regex; 723 char *p0, *p1 = regex;
724 724
725 /* Convert "*" to ".*", "?" to ".". */ 725 /* Convert "*" to ".*", "?" to ".". */