luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't copy strings which are marked as static. Don't allow non-canonical

Browse Source 
2005-03-20  Matthias Clasen  <mclasen@redhat.com>

	* gparam.c (g_param_spec_internal): Don't copy strings
	which are marked as static. Don't allow non-canonical static
	names.

	* gparam.h (GParamFlags): Add G_PARAM_STATIC_{NAME,NICK,BLURB}
	flags.  (#160655, Ben Maurer)
This commit is contained in:
Matthias Clasen
2005-03-21 04:55:26 +00:00
committed by Matthias Clasen
parent 446c1f1aa8
commit 4bd613efc4
5 changed files with 76 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gobject/gparam.c
View File

@@ -152,10 +152,15 @@ static void
g_param_spec_finalize (GParamSpec *pspec)
{
g_datalist_clear (&pspec->qdata);
if (!(pspec->flags & G_PARAM_STATIC_NAME))
g_free (pspec->name);
g_free (pspec->name);
g_free (pspec->_nick);
g_free (pspec->_blurb);
if (!(pspec->flags & G_PARAM_STATIC_NICK))
g_free (pspec->_nick);
if (!(pspec->flags & G_PARAM_STATIC_BLURB))
g_free (pspec->_blurb);
g_type_free_instance ((GTypeInstance*) pspec);
}
@@ -297,6 +302,25 @@ canonicalize_key (gchar *key)
}
}
static gboolean
is_canonical (gchar *key)
{
gchar *p;
for (p = key; *p != 0; p++)
{
gchar c = *p;
if (c != '-' &&
(c < '0' || c > '9') &&
(c < 'A' || c > 'Z') &&
(c < 'a' || c > 'z'))
return FALSE;
}
return TRUE;
}
gpointer
g_param_spec_internal (GType param_type,
const gchar *name,
@@ -309,12 +333,28 @@ g_param_spec_internal (GType param_type,
g_return_val_if_fail (G_TYPE_IS_PARAM (param_type) && param_type != G_TYPE_PARAM, NULL);
g_return_val_if_fail (name != NULL, NULL);
g_return_val_if_fail ((name[0] >= 'A' && name[0] <= 'Z') || (name[0] >= 'a' && name[0] <= 'z'), NULL);
g_return_val_if_fail (!(flags & G_PARAM_STATIC_NAME) || is_canonical (name), NULL);
pspec = (gpointer) g_type_create_instance (param_type);
pspec->name = g_strdup (name);
canonicalize_key (pspec->name);
pspec->_nick = g_strdup (nick);
pspec->_blurb = g_strdup (blurb);
if ((flags & G_PARAM_STATIC_NAME))
pspec->name = name;
else
{
pspec->name = g_strdup (name);
canonicalize_key (pspec->name);
}
if (flags & G_PARAM_STATIC_NICK)
pspec->_nick = nick;
else
pspec->_nick = g_strdup (nick);
if (flags & G_PARAM_STATIC_BLURB)
pspec->_blurb = blurb;
else
pspec->_blurb = g_strdup (blurb);
pspec->flags = (flags & G_PARAM_USER_MASK) | (flags & G_PARAM_MASK);
return pspec;