# HG changeset patch # User Gerd Moellmann # Date 994767550 0 # Node ID 3238db7bdfefcc8836f5807a9c5de621f25574c7 # Parent f70837a465ac77fb144244ada745026bb283ff39 (Fx_create_frame): Initialize frame colors to -1, for the case that x_decode_colors signals an error. diff -r f70837a465ac -r 3238db7bdfef src/xfns.c --- a/src/xfns.c Tue Jul 10 10:46:53 2001 +0000 +++ b/src/xfns.c Tue Jul 10 12:19:10 2001 +0000 @@ -4182,6 +4182,16 @@ { 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);