From cefecbcf1d9e2c5e48c4d6dd7b69841855a6684c Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 10 Jul 2001 12:19:10 +0000 Subject: [PATCH] (Fx_create_frame): Initialize frame colors to -1, for the case that x_decode_colors signals an error. --- src/xfns.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/xfns.c b/src/xfns.c index 1f4fb43dda8..0d66c03e235 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4182,6 +4182,16 @@ This function is an internal primitive--use `make-frame' instead.") { Lisp_Object black; struct gcpro gcpro1; + + /* Function x_decode_color can signal an error. Make + sure to initialize color slots so that we won't try + to free colors we haven't allocated. */ + f->output_data.x->foreground_pixel = -1; + f->output_data.x->background_pixel = -1; + f->output_data.x->cursor_pixel = -1; + f->output_data.x->cursor_foreground_pixel = -1; + f->output_data.x->border_pixel = -1; + f->output_data.x->mouse_pixel = -1; black = build_string ("black"); GCPRO1 (black); -- 2.39.2