2 files changed, 13 insertions, 7 deletions

diff --git a/base/gdevprn.c b/base/gdevprn.c
index b94542805..3518ce6fe 100644
--- a/base/gdevprn.c
+++ b/base/gdevprn.c
@@ -233,6 +233,7 @@ gdev_prn_setup_as_command_list(gx_device *pdev, gs_memory_t *buffer_memory,
     gx_device_clist_common * const pcldev = &pclist_dev->common;
     bool reallocate = *the_memory != 0;
     byte *base;
+    bool save_is_open = pdev->is_open;  /* Save around temporary failure in open_c loop */
 
     while (target->parent != NULL) {
         target = target->parent;
@@ -303,8 +304,10 @@ open_c:
                                    "cmd list buf(retry open)");
             }
             ppdev->buf = *the_memory;
-            if (base != 0)
+            if (base != 0) {
+                pdev->is_open = save_is_open;   /* allow for success when we loop */
                 goto open_c;
+            }
         }
         /* Failure. */
         if (!reallocate) {
diff --git a/base/gxclist.c b/base/gxclist.c
index 07ed6e9dd..14b825ccf 100644
--- a/base/gxclist.c
+++ b/base/gxclist.c
@@ -703,19 +703,22 @@ clist_open(gx_device *dev)
 
     code = clist_init(dev);
     if (code < 0)
-        return code;
+        goto errxit;
+
     cdev->icc_cache_list_len = 0;
     cdev->icc_cache_list = NULL;
     code = clist_open_output_file(dev);
     if ( code >= 0)
         code = clist_emit_page_header(dev);
     if (code >= 0) {
-       dev->is_open = save_is_open;
-    } else {
-        gs_free_object(cdev->memory->non_gc_memory, cdev->cache_chunk, "free tile cache for clist");
-        cdev->cache_chunk = NULL;
+        dev->is_open = save_is_open;
+        return code;            /* success */
     }
-
+    /* fall through to clean up and return error code */
+errxit:
+    /* prevent leak */
+    gs_free_object(cdev->memory->non_gc_memory, cdev->cache_chunk, "free tile cache for clist");
+    cdev->cache_chunk = NULL;
     return code;
 }