diff options
author | Alp Aker <alp.tekin.aker@gmail.com> | 2012-08-18 20:53:29 -0400 |
---|---|---|
committer | Alp Aker <alp.tekin.aker@gmail.com> | 2012-08-18 20:53:29 -0400 |
commit | d7191076ce331e8c78dbc93b76d0e346c268daa0 (patch) | |
tree | 890bed4c25b26e2618c976500219f6efea05945c | |
parent | e757f1c6f393cf82057dbee0a4325b07f0fd55c4 (diff) | |
download | emacs-d7191076ce331e8c78dbc93b76d0e346c268daa0.tar.gz |
* nsfont.m (ns_ascii_average_width): Ensure the string
ascii_printable is initialized with a null-terminated character
array. Otherwise, it can contain undesired extra characters.
-rw-r--r-- | src/ChangeLog | 6 | ||||
-rw-r--r-- | src/nsfont.m | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1956d602e6a..5956eea1c51 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-08-18 Alp Aker <alp.tekin.aker@gmail.com> + + * nsfont.m (ns_ascii_average_width): Ensure the string + ascii_printable is initialized with a null-terminated character + array. Otherwise, it can contain undesired extra characters. + 2012-08-18 Paul Eggert <eggert@cs.ucla.edu> port new setting code to Sun C 5.8 2005/10/13 diff --git a/src/nsfont.m b/src/nsfont.m index 1f8d28cd238..412a6777c64 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -270,10 +270,11 @@ ns_ascii_average_width (NSFont *sfont) if (!ascii_printable) { - char chars[95]; + char chars[96]; int ch; for (ch = 0; ch < 95; ch++) chars[ch] = ' ' + ch; + chars[95] = '\0'; ascii_printable = [[NSString alloc] initWithFormat: @"%s", chars]; } |