luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

GApplications: Tighten up application-id validity checks

Browse Source 
Also add tests for these conditions.
https://bugzilla.gnome.org/show_bug.cgi?id=643197
This commit is contained in:
Matthias Clasen 2011-02-25 11:13:55 -05:00
parent c430ad0b1b
commit e3cff93408
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gio/gapplication.c
View File

@ -647,9 +647,9 @@ get_platform_data (GApplication *application)
* For convenience, the restrictions on application identifiers are
* reproduced here:
* <itemizedlist>
* <listitem>Application identifiers must contain only the ASCII characters "[A-Z][a-z][0-9]_-" and must not begin with a digit.</listitem>
* <listitem>Application identifiers must contain at least one '.' (period) character (and thus at least two elements).</listitem>
* <listitem>Application identifiers must not begin with a '.' (period) character.</listitem>
* <listitem>Application identifiers must contain only the ASCII characters "[A-Z][a-z][0-9]_-." and must not begin with a digit.</listitem>
* <listitem>Application identifiers must contain at least one '.' (period) character (and thus at least three elements).</listitem>
* <listitem>Application identifiers must not begin or end with a '.' (period) character.</listitem>
* <listitem>Application identifiers must not contain consecutive '.' (period) characters.</listitem>
* <listitem>Application identifiers must not exceed 255 characters.</listitem>
* </itemizedlist>
@ -657,28 +657,44 @@ get_platform_data (GApplication *application)
gboolean
g_application_id_is_valid (const gchar *application_id)
{
gsize len;
gboolean allow_dot;
gboolean has_dot;
if (strlen (application_id) > 255)
len = strlen (application_id);
if (len > 255)
return FALSE;
if (!g_ascii_isalpha (*application_id))
if (!g_ascii_isalpha (application_id[0]))
return FALSE;
if (application_id[len-1] == '.')
return FALSE;
application_id++;
allow_dot = FALSE;
allow_dot = TRUE;
has_dot = FALSE;
for (; *application_id; application_id++)
{
if (g_ascii_isalnum (*application_id) ||
(*application_id == '-') ||
(*application_id == '_'))
allow_dot = TRUE;
{
allow_dot = TRUE;
}
else if (allow_dot && *application_id == '.')
allow_dot = FALSE;
{
has_dot = TRUE;
allow_dot = FALSE;
}
else
return FALSE;
}
if (!has_dot)
return FALSE;
return TRUE;
}