procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix usage of string data pointers in xfaces.c

Browse source 
* src/xfaces.c (tty_defined_color): Don't use SSDATA pointers
across calls to Lisp.  (Bug#77046)
This commit is contained in:
Eli Zaretskii 2025-03-22 18:45:38 +02:00
parent 764f23ef43
commit 9816c61c48
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/xfaces.c
View file

@ -1150,14 +1150,18 @@ tty_defined_color (struct frame *f, const char *color_name,
color_def->green = 0;
if (*color_name)
status = tty_lookup_color (f, build_string (color_name), color_def, NULL);
if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name)
{
if (strcmp (color_name, "unspecified-fg") == 0)
color_def->pixel = FACE_TTY_DEFAULT_FG_COLOR;
else if (strcmp (color_name, "unspecified-bg") == 0)
color_def->pixel = FACE_TTY_DEFAULT_BG_COLOR;
Lisp_Object lcolor = build_string (color_name);
status = tty_lookup_color (f, lcolor, color_def, NULL);
if (color_def->pixel == FACE_TTY_DEFAULT_COLOR)
{
color_name = SSDATA (lcolor);
if (strcmp (color_name, "unspecified-fg") == 0)
color_def->pixel = FACE_TTY_DEFAULT_FG_COLOR;
else if (strcmp (color_name, "unspecified-bg") == 0)
color_def->pixel = FACE_TTY_DEFAULT_BG_COLOR;
}
}
if (color_def->pixel != FACE_TTY_DEFAULT_COLOR)