Commit 40aa3f13 authored by Jim Meyering's avatar 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.
parent 8c9d5f9f
2009-06-09 Jim Meyering <meyering@redhat.com>
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 <handa@m17n.org>
* charset.c (Fmap_charset_chars): In docstring, state clearly that
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment