isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-12 04:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[path] Do not accept NULL descriptions

Browse Source 
Bug 1465 - clutter_path_parse_description should check p==NULL

When accepting a stringified path description, ClutterPath methods
and the parser should not accept NULL or empty strings.
This commit is contained in:
Emmanuele Bassi 2009-02-20 11:17:52 +00:00
parent 96317854c8
commit effbbe2e1e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-path.c
View File

@ -568,8 +568,11 @@ static gboolean
clutter_path_parse_description (const gchar *p, clutter_path_parse_description (const gchar *p,
GSList **ret) GSList **ret)
{ {
GSList *nodes = NULL;
ClutterPathNodeFull *node; ClutterPathNodeFull *node;
GSList *nodes = NULL;
if (p == NULL || *p == '\0')
return FALSE;
while (TRUE) while (TRUE)
{ {
@ -720,6 +723,7 @@ clutter_path_add_string (ClutterPath *path,
GSList *nodes; GSList *nodes;
g_return_val_if_fail (CLUTTER_IS_PATH (path), FALSE); g_return_val_if_fail (CLUTTER_IS_PATH (path), FALSE);
g_return_val_if_fail (str != NULL, FALSE);
if (clutter_path_parse_description (str, &nodes)) if (clutter_path_parse_description (str, &nodes))
{ {
@ -1099,11 +1103,13 @@ clutter_path_replace_node (ClutterPath *path,
* Since: 1.0 * Since: 1.0
*/ */
gboolean gboolean
clutter_path_set_description (ClutterPath *path, const gchar *str) clutter_path_set_description (ClutterPath *path,
const gchar *str)
{ {
GSList *nodes; GSList *nodes;
g_return_val_if_fail (CLUTTER_IS_PATH (path), FALSE); g_return_val_if_fail (CLUTTER_IS_PATH (path), FALSE);
g_return_val_if_fail (str != NULL, FALSE);
if (clutter_path_parse_description (str, &nodes)) if (clutter_path_parse_description (str, &nodes))
{ {