From: Jim Meyering Date: Tue, 9 Jun 2009 05:57:35 +0000 (+0000) Subject: x-load-color-file: avoid array bounds error X-Git-Tag: emacs-pretest-23.0.95~104 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=40aa3f13c674e5c78bb6c0e85de8f5f0ef3690a7;p=emacs.git x-load-color-file: avoid array bounds error x-load-color-file expects each line of input to be of the form "R G B name". But if "name" is missing, it would read name[-1], and if that value is '\n', zero it. * xfaces.c (Fx_load_color_file): Handle missing color name. --- diff --git a/src/ChangeLog b/src/ChangeLog index 399faf60b47..5287bf704c9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2009-06-09 Jim Meyering + + x-load-color-file: avoid array bounds error + x-load-color-file expects each line of input to be of the form + "R G B name". But if "name" is missing, it would read name[-1], + and if that value is '\n', zero it. + * xfaces.c (Fx_load_color_file): Handle missing color name. + 2009-06-09 Kenichi Handa * charset.c (Fmap_charset_chars): In docstring, state clearly that diff --git a/src/xfaces.c b/src/xfaces.c index 444376838b9..704d7a92049 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6630,7 +6630,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) { char *name = buf + num; num = strlen (name) - 1; - if (name[num] == '\n') + if (num >= 0 && name[num] == '\n') name[num] = 0; cmap = Fcons (Fcons (build_string (name), #ifdef WINDOWSNT