[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1581-g924f701

The ghostpdl branch, master has been updated
       via  924f701fdc990ac981fb08c4f6c21c668b8b74ef (commit)
      from  79350a5f0fc9514746f34ff0820f0b6a89f67117 (commit)

----------------------------------------------------------------------
commit 924f701fdc990ac981fb08c4f6c21c668b8b74ef
Author: Chris Liddell <[email protected]>
Date:   Fri Aug 16 11:45:01 2019 +0100

    Fix X11 device ICC profile memory leaks
    
    When the x11 devices are running in "buffered mode" (i.e. we render to a
    pixmap, then blit the pixmap to the X11 Window), we create a memory device
    which actually does the rendering.
    
    The memory device takes a reference to the ICC profiles from the x11 device
    and it is reference counted.
    
    Firstly, we always incremented the reference count, ignoring the posibility
    that we were resizing an existing memory device rather than creating a new one.
    
    Secondly, when shutting down the x11 device, we ignored posibility that
    buffering was in force, and failed to free the memory device - most of the
    memory was hoovered up by the garbager, but the ICC profile data isn't in
    gc memory, hence showing a leak.
    
    So, fix the memory device ICC reference counting, and reconfigure the device
    as non-buffering before we shut it down.

diff --git a/devices/gdevxini.c b/devices/gdevxini.c
index 98c743a..3b46b18 100644
--- a/devices/gdevxini.c
+++ b/devices/gdevxini.c
@@ -634,6 +634,7 @@ x_set_buffer(gx_device_X * xdev)
             xdev->buffer = buffer;
             mdev->width = xdev->width;
             mdev->height = xdev->height;
+            rc_decrement(mdev->icc_struct, "x_set_buffer");
             mdev->icc_struct = xdev->icc_struct;
             rc_increment(xdev->icc_struct);
             mdev->color_info = xdev->orig_color_info;
@@ -939,6 +940,8 @@ gdev_x_put_params(gx_device * dev, gs_param_list * plist)
 int
 gdev_x_close(gx_device_X *xdev)
 {
+    long MaxBitmap = xdev->space_params.MaxBitmap;
+
     if (xdev->ghostview)
         gdev_x_send_event(xdev, xdev->DONE);
     if (xdev->vinfo) {
@@ -952,5 +955,10 @@ gdev_x_close(gx_device_X *xdev)
         XFreeGC(xdev->dpy, xdev->gc);
 
     XCloseDisplay(xdev->dpy);
+    /* MaxBitmap == 0 ensures x_set_buffer() configures as non-buffering */
+    xdev->space_params.MaxBitmap = 0;
+    x_set_buffer(xdev);
+    xdev->space_params.MaxBitmap = MaxBitmap;
+
     return 0;
 }


Summary of changes:
 devices/gdevxini.c | 8 ++++++++
 1 file changed, 8 insertions(+)