2 files changed, 11 insertions, 8 deletions

diff --git a/gs/base/gxclmem.c b/gs/base/gxclmem.c
index 0445b6448..dbc1ba5bb 100644
--- a/gs/base/gxclmem.c
+++ b/gs/base/gxclmem.c
@@ -803,19 +803,18 @@ memfile_fwrite_chars(const void *data, uint len, clist_file_ptr cf)
     while (count) {
         uint move_count = f->pdata_end - f->pdata;
 
-        if (move_count == 0) {
+        if (move_count > count)
+            move_count = count;
+        memmove(f->pdata, str, move_count);
+        f->pdata += move_count;
+        str += move_count;
+        count -= move_count;
+        if (f->pdata == f->pdata_end) {
             if ((ecode = memfile_next_blk(f)) != 0) {
                 f->error_code = ecode;
                 if (ecode < 0)
                     return 0;
             }
-        } else {
-            if (move_count > count)
-                move_count = count;
-            memmove(f->pdata, str, move_count);
-            f->pdata += move_count;
-            str += move_count;
-            count -= move_count;
         }
     }
     f->log_curr_pos += len;
diff --git a/gs/base/gxclread.c b/gs/base/gxclread.c
index 4d4bc6d46..7b840f66f 100644
--- a/gs/base/gxclread.c
+++ b/gs/base/gxclread.c
@@ -350,8 +350,12 @@ clist_close_writer_and_init_reader(gx_device_clist *cldev)
         if (code < 0)
             return code;
         code = clist_render_init(cldev);
+        if (code < 0)
+            return code;
          /* Check for and get ICC profile table */
         code = clist_read_icctable(crdev);
+        if (code < 0)
+            return code;
         /* Allocate the icc cache for the clist reader */
         /* Since we may be rendering in multiple threads, make sure the memory */
         /* is thread safe by using a known thread_safe memory allocator */