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

Make sure items passed as "parent" are actually group items 

Add precondition checks to all image add() and reorder() functions
This commit is contained in:
Michael Natterer 2009-08-07 10:14:11 +02:00
parent 7661513746
commit dc53e81705
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/core/gimpimage.c
View File

@ -3059,6 +3059,10 @@ gimp_image_add_layer (GimpImage *image,
parent == GIMP_IMAGE_ACTIVE_PARENT ||
gimp_item_get_image (GIMP_ITEM (parent)) == image,
FALSE);
g_return_val_if_fail (parent == NULL ||
parent == GIMP_IMAGE_ACTIVE_PARENT ||
gimp_viewable_get_children (GIMP_VIEWABLE (parent)),
FALSE);
active_layer = gimp_image_get_active_layer (image);
@ -3261,6 +3265,9 @@ gimp_image_add_layers (GimpImage *image,
g_return_if_fail (parent == NULL ||
parent == GIMP_IMAGE_ACTIVE_PARENT ||
gimp_item_get_image (GIMP_ITEM (parent)) == image);
g_return_if_fail (parent == NULL ||
parent == GIMP_IMAGE_ACTIVE_PARENT ||
gimp_viewable_get_children (GIMP_VIEWABLE (parent)));
active_layer = gimp_image_get_active_layer (image);
@ -3426,6 +3433,9 @@ gimp_image_reorder_layer (GimpImage *image,
g_return_val_if_fail (new_parent == NULL ||
gimp_item_get_image (GIMP_ITEM (new_parent)) == image,
FALSE);
g_return_val_if_fail (new_parent == NULL ||
gimp_viewable_get_children (GIMP_VIEWABLE (new_parent)),
FALSE);
container = gimp_item_get_container (GIMP_ITEM (layer));
@ -3487,6 +3497,10 @@ gimp_image_add_channel (GimpImage *image,
parent == GIMP_IMAGE_ACTIVE_PARENT ||
gimp_item_get_image (GIMP_ITEM (parent)) == image,
FALSE);
g_return_val_if_fail (parent == NULL ||
parent == GIMP_IMAGE_ACTIVE_PARENT ||
gimp_viewable_get_children (GIMP_VIEWABLE (parent)),
FALSE);
active_channel = gimp_image_get_active_channel (image);
@ -3729,6 +3743,9 @@ gimp_image_reorder_channel (GimpImage *image,
g_return_val_if_fail (new_parent == NULL ||
gimp_item_get_image (GIMP_ITEM (new_parent)) == image,
FALSE);
g_return_val_if_fail (new_parent == NULL ||
gimp_viewable_get_children (GIMP_VIEWABLE (new_parent)),
FALSE);
container = gimp_item_get_container (GIMP_ITEM (channel));
@ -3790,6 +3807,10 @@ gimp_image_add_vectors (GimpImage *image,
parent == GIMP_IMAGE_ACTIVE_PARENT ||
gimp_item_get_image (GIMP_ITEM (parent)) == image,
FALSE);
g_return_val_if_fail (parent == NULL ||
parent == GIMP_IMAGE_ACTIVE_PARENT ||
gimp_viewable_get_children (GIMP_VIEWABLE (parent)),
FALSE);
active_vectors = gimp_image_get_active_vectors (image);
@ -4006,6 +4027,9 @@ gimp_image_reorder_vectors (GimpImage *image,
g_return_val_if_fail (new_parent == NULL ||
gimp_item_get_image (GIMP_ITEM (new_parent)) == image,
FALSE);
g_return_val_if_fail (new_parent == NULL ||
gimp_viewable_get_children (GIMP_VIEWABLE (new_parent)),
FALSE);
container = gimp_item_get_container (GIMP_ITEM (vectors));