[gimp/gimp-2-8] Bug 748762 - GIMP crashes when a selection is outside a layer boundary...

[Michael Natterer <mitch src gnome org>]

commit bfd8def5c02e303657a39323e13fe2497591fa1c
Author: Michael Natterer <mitch gimp org>
Date:   Sat May 2 00:00:39 2015 -0400

    Bug 748762 - GIMP crashes when a selection is outside a layer boundary...
    
    ...and % is selected in rotate Tool
    
    Refuse to start any transform tool (with an error message) if the
    selection doesn't intersect with the layer.
    
    (cherry picked from commit 93414342c3b2019f787a90c7da2100f3da398bc6)

 app/tools/gimptransformtool.c |   47 +++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 18 deletions(-)
---
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index ff976ea..d4e5fb2 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -132,9 +132,9 @@ static TileManager *
                                                              gint                  *new_offset_x,
                                                              gint                  *new_offset_y);
 
-static void      gimp_transform_tool_set_function           (GimpTransformTool *tr_tool,
-                                                             TransformAction    function);
-static void      gimp_transform_tool_bounds                 (GimpTransformTool     *tr_tool,
+static void      gimp_transform_tool_set_function           (GimpTransformTool     *tr_tool,
+                                                             TransformAction        function);
+static gboolean  gimp_transform_tool_bounds                 (GimpTransformTool     *tr_tool,
                                                              GimpDisplay           *display);
 static void      gimp_transform_tool_dialog                 (GimpTransformTool     *tr_tool);
 static void      gimp_transform_tool_prepare                (GimpTransformTool     *tr_tool,
@@ -258,6 +258,18 @@ gimp_transform_tool_initialize (GimpTool     *tool,
     {
       gint i;
 
+      gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+
+      /*  Find the transform bounds for some tools (like scale,
+       *  perspective) that actually need the bounds for initializing
+       */
+      if (! gimp_transform_tool_bounds (tr_tool, display))
+        {
+          g_set_error (error, GIMP_ERROR, GIMP_FAILED,
+                       _("The selection does not intersect with the layer."));
+          return FALSE;
+        }
+
       /*  Set the pointer to the active display  */
       tool->display  = display;
       tool->drawable = drawable;
@@ -266,11 +278,6 @@ gimp_transform_tool_initialize (GimpTool     *tool,
       if (! tr_tool->dialog)
         gimp_transform_tool_dialog (tr_tool);
 
-      /*  Find the transform bounds for some tools (like scale,
-       *  perspective) that actually need the bounds for initializing
-       */
-      gimp_transform_tool_bounds (tr_tool, display);
-
       /*  Inizialize the tool-specific trans_info, and adjust the
        *  tool dialog
        */
@@ -1232,12 +1239,13 @@ gimp_transform_tool_transform_bounding_box (GimpTransformTool *tr_tool)
                                 &tr_tool->tcx, &tr_tool->tcy);
 }
 
-static void
+static gboolean
 gimp_transform_tool_bounds (GimpTransformTool *tr_tool,
                             GimpDisplay       *display)
 {
-  GimpTransformOptions *options = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
-  GimpImage            *image   = gimp_display_get_image (display);
+  GimpTransformOptions *options   = GIMP_TRANSFORM_TOOL_GET_OPTIONS (tr_tool);
+  GimpImage            *image     = gimp_display_get_image (display);
+  gboolean              non_empty = TRUE;
 
   switch (options->type)
     {
@@ -1246,18 +1254,19 @@ gimp_transform_tool_bounds (GimpTransformTool *tr_tool,
         GimpDrawable *drawable;
         gint          offset_x;
         gint          offset_y;
+        gint          x, y;
+        gint          width, height;
 
         drawable = gimp_image_get_active_drawable (image);
 
         gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
 
-        gimp_item_mask_bounds (GIMP_ITEM (drawable),
-                               &tr_tool->x1, &tr_tool->y1,
-                               &tr_tool->x2, &tr_tool->y2);
-        tr_tool->x1 += offset_x;
-        tr_tool->y1 += offset_y;
-        tr_tool->x2 += offset_x;
-        tr_tool->y2 += offset_y;
+        non_empty = gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                              &x, &y, &width, &height);
+        tr_tool->x1 = x + offset_x;
+        tr_tool->y1 = y + offset_y;
+        tr_tool->x2 = x + width  + offset_x;
+        tr_tool->y2 = y + height + offset_y;
       }
       break;
 
@@ -1274,6 +1283,8 @@ gimp_transform_tool_bounds (GimpTransformTool *tr_tool,
 
   tr_tool->aspect = ((gdouble) (tr_tool->x2 - tr_tool->x1) /
                      (gdouble) (tr_tool->y2 - tr_tool->y1));
+
+  return non_empty;
 }
 
 static void