dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

validate the font name. This should work around the crashes that Windows 

2004-03-28  Sven Neumann  <sven@gimp.org>

	* app/text/gimpfontlist.c (gimp_font_list_add_font): validate the
	font name. This should work around the crashes that Windows users
	were experiencing on startup (bug #132366). The real problem needs
	to be fixed elsewhere though.
This commit is contained in:
Sven Neumann 2004-03-28 14:27:37 +00:00 committed by Sven Neumann
parent 0af7cfa584
commit dd94d1cb05
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-03-28 Sven Neumann <sven@gimp.org>
* app/text/gimpfontlist.c (gimp_font_list_add_font): validate the
font name. This should work around the crashes that Windows users
were experiencing on startup (bug #132366). The real problem needs
to be fixed elsewhere though.
2004-03-28 Michael Natterer <mitch@gimp.org>
* app/core/gimpimage-undo-push.c (undo_pop_layer): when re-adding

19
app/text/gimpfontlist.c
View File

@ -2,8 +2,9 @@
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpfontlist.c
* Copyright (C) 2003 Michael Natterer <mitch@gimp.org>
* Sven Neumann <sven@gimp.org>
* Copyright (C) 2003-2004 Michael Natterer <mitch@gimp.org>
* Sven Neumann <sven@gimp.org>
* Manish Singh <yosh@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -153,11 +154,17 @@ gimp_font_list_add_font (GimpFontList *list,
GimpFont *font;
gchar *name;
if (desc == NULL)
if (! desc)
return;
name = pango_font_description_to_string (desc);
if (! g_utf8_validate (name, -1, NULL))
{
g_free (name);
return;
}
font = g_object_new (GIMP_TYPE_FONT,
"name", name,
"pango-context", context,
@ -173,7 +180,8 @@ gimp_font_list_add_font (GimpFontList *list,
/* We're really chummy here with the implementation. Oh well. */
/* This is copied straight from make_alias_description in pango, plus
* the gimp_font_list_add_font bits. */
* the gimp_font_list_add_font bits.
*/
static void
gimp_font_list_make_alias (GimpFontList *list,
PangoContext *context,
@ -278,7 +286,7 @@ gimp_font_list_font_desc_from_pattern (FcPattern *pattern)
weight = PANGO_WEIGHT_NORMAL;
pango_font_description_set_weight (desc, weight);
if (FcPatternGetInteger (pattern, FC_WIDTH, 0, &i) == FcResultMatch)
{
switch (i)
@ -393,4 +401,5 @@ gimp_font_list_load_names (GimpFontList *list,
g_free (families);
}
#endif