To: vim-dev@vim.org Subject: Patch 5.6.006 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.6.006 Problem: GTK GUI: Bold font cannot always be used. Memory is freed too early in gui_mch_init_font(). Solution: Move call to g_free() to after where sdup is used. (Artem Hodyush) Files: src/gui_gtk_x11.c *** ../vim-5.6.5/src/gui_gtk_x11.c Sun Jan 16 14:08:56 2000 --- src/gui_gtk_x11.c Fri Jan 21 20:36:18 2000 *************** *** 2107,2114 **** ++i; } - g_free(sdup); - if (i == 14) { char *bold_name = NULL; --- 2107,2112 ---- *************** *** 2125,2130 **** --- 2123,2129 ---- vim_free(bold_name); vim_free(ital_name); vim_free(italbold_name); + g_free(sdup); return FAIL; } *************** *** 2182,2187 **** --- 2181,2188 ---- vim_free(ital_name); vim_free(italbold_name); } + + g_free(sdup); } /* Synchronize the fonts used in user input dialogs, since otherwise *** ../vim-5.6.5/src/version.c Fri Jan 21 20:42:31 2000 --- src/version.c Fri Jan 21 20:41:21 2000 *************** *** 420,421 **** --- 420,423 ---- { /* Add new patch number below this line */ + /**/ + 6, /**/ -- GALAHAD: No. Look, I can tackle this lot single-handed! GIRLS: Yes, yes, let him Tackle us single-handed! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /