Blame SOURCES/8171000-pr3542-rh1402819.patch

43ae3d
# HG changeset patch
43ae3d
# User kaddepalli
43ae3d
# Date 1517818481 -19800
43ae3d
#      Mon Feb 05 13:44:41 2018 +0530
43ae3d
# Node ID b77308735540644d4710244e3c88865067f2905a
43ae3d
# Parent  39bfc94b1f4265b645c2970a58389acc779dafe9
43ae3d
8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
43ae3d
Reviewed-by: serb, mhalder
43ae3d
43ae3d
diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
43ae3d
--- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
43ae3d
+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
43ae3d
@@ -394,77 +394,48 @@
43ae3d
 XRectangle      bbox;           /* bounding box of grabbed area */
43ae3d
 list_ptr regions;/* list of regions to read from */
43ae3d
 {
43ae3d
-    image_region_type   *reg;
43ae3d
-    int32_t                     dst_x, dst_y;   /* where in pixmap to write (UL) */
43ae3d
-    int32_t                     diff;
43ae3d
-
43ae3d
-    XImage              *reg_image,*ximage ;
43ae3d
-    int32_t             srcRect_x,srcRect_y,srcRect_width,srcRect_height ;
43ae3d
-    int32_t     rem ;
43ae3d
-    int32_t     bytes_per_line;
43ae3d
-    int32_t     bitmap_unit;
43ae3d
-
43ae3d
-    bitmap_unit = sizeof (long);
43ae3d
-    if (format == ZPixmap)
43ae3d
-       bytes_per_line = width*depth/8;
43ae3d
-    else
43ae3d
-       bytes_per_line = width/8;
43ae3d
-
43ae3d
-
43ae3d
-    /* Find out how many more bytes are required for padding so that
43ae3d
-    ** bytes per scan line will be multiples of bitmap_unit bits */
43ae3d
-    if (format == ZPixmap) {
43ae3d
-       rem = (bytes_per_line*8)%bitmap_unit;
43ae3d
-    if (rem)
43ae3d
-       bytes_per_line += (rem/8 + 1);
43ae3d
-    }
43ae3d
+    XImage              *ximage ;
43ae3d
 
43ae3d
     ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
43ae3d
                           (uint32_t)width,(uint32_t)height,8,0);
43ae3d
 
43ae3d
-    bytes_per_line = ximage->bytes_per_line;
43ae3d
-
43ae3d
-    if (format == ZPixmap)
43ae3d
-          ximage->data = malloc(height*bytes_per_line);
43ae3d
-    else
43ae3d
-        ximage->data = malloc(height*bytes_per_line*depth);
43ae3d
-
43ae3d
+    ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char));
43ae3d
     ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
43ae3d
 
43ae3d
-    for (reg = (image_region_type *) first_in_list( regions); reg;
43ae3d
+    for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
43ae3d
          reg = (image_region_type *) next_in_list( regions))
43ae3d
     {
43ae3d
-                int32_t rect;
43ae3d
-                struct my_XRegion *vis_reg;
43ae3d
-                vis_reg = (struct my_XRegion *)(reg->visible_region);
43ae3d
-                for (rect = 0;
43ae3d
-                     rect < vis_reg->numRects;
43ae3d
-                     rect++)
43ae3d
+                struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region);
43ae3d
+                for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
43ae3d
                 {
43ae3d
-                /** ------------------------------------------------------------------------
43ae3d
-                        Intersect bbox with visible part of region giving src rect & output
43ae3d
-                        location.  Width is the min right side minus the max left side.
43ae3d
-                        Similar for height.  Offset src rect so x,y are relative to
43ae3d
-                        origin of win, not the root-relative visible rect of win.
43ae3d
-                    ------------------------------------------------------------------------ **/
43ae3d
-                    srcRect_width  = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
43ae3d
-             - MAX( vis_reg->rects[rect].x1, bbox.x);
43ae3d
+                    /** ------------------------------------------------------------------------
43ae3d
+                            Intersect bbox with visible part of region giving src rect & output
43ae3d
+                            location.  Width is the min right side minus the max left side.
43ae3d
+                            Similar for height.  Offset src rect so x,y are relative to
43ae3d
+                            origin of win, not the root-relative visible rect of win.
43ae3d
+                        ------------------------------------------------------------------------ **/
43ae3d
+                        int32_t srcRect_width  = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x)
43ae3d
+                                         - MAX( vis_reg->rects[rect].x1, bbox.x);
43ae3d
+
43ae3d
+                        int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
43ae3d
+                                         - MAX( vis_reg->rects[rect].y1, bbox.y);
43ae3d
 
43ae3d
-                    srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y)
43ae3d
-             - MAX( vis_reg->rects[rect].y1, bbox.y);
43ae3d
+                        int32_t diff = bbox.x - vis_reg->rects[rect].x1;
43ae3d
+                        int32_t srcRect_x = MAX( 0, diff)  + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
43ae3d
+                        int32_t dst_x     = MAX( 0, -diff) ;
43ae3d
 
43ae3d
-                    diff = bbox.x - vis_reg->rects[rect].x1;
43ae3d
-                    srcRect_x = MAX( 0, diff)  + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
43ae3d
-                    dst_x     = MAX( 0, -diff) ;
43ae3d
-                    diff = bbox.y - vis_reg->rects[rect].y1;
43ae3d
-                    srcRect_y = MAX( 0, diff)  + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
43ae3d
-                    dst_y     = MAX( 0, -diff) ;
43ae3d
-            reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
43ae3d
-             (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
43ae3d
-                    TransferImage(disp,reg_image,srcRect_width,
43ae3d
-                                 srcRect_height,reg,ximage,dst_x,dst_y) ;
43ae3d
-            XDestroyImage(reg_image);
43ae3d
-            }
43ae3d
+                        diff = bbox.y - vis_reg->rects[rect].y1;
43ae3d
+                        int32_t srcRect_y = MAX( 0, diff)  + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border);
43ae3d
+                        int32_t dst_y     = MAX( 0, -diff) ;
43ae3d
+                        XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
43ae3d
+                                            (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
43ae3d
+
43ae3d
+                        if (reg_image) {
43ae3d
+                            TransferImage(disp,reg_image,srcRect_width,
43ae3d
+                                            srcRect_height,reg,ximage,dst_x,dst_y) ;
43ae3d
+                            XDestroyImage(reg_image);
43ae3d
+                        }
43ae3d
+                }
43ae3d
     }
43ae3d
     return ximage ;
43ae3d
 }