[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1730-g65dbe88

The ghostpdl branch, master has been updated
       via  65dbe88e660adcfba315fe559fcd7fd97628ee49 (commit)
      from  e22ef03cdd31263ba1266f3d53aef7be4467e405 (commit)

----------------------------------------------------------------------
commit 65dbe88e660adcfba315fe559fcd7fd97628ee49
Author: Ray Johnston <[email protected]>
Date:   Wed Oct 16 06:52:51 2019 -0700

    Fix bug 701718: Use separate 'if' in clist_fillpage.
    
    The intent was to return the error code if clist_close_writer_and_init_reader
    failed, THEN run clist_finish_page and similarly return if that fails.

diff --git a/base/gxclrect.c b/base/gxclrect.c
index 1eaa391..6f53ddd 100644
--- a/base/gxclrect.c
+++ b/base/gxclrect.c
@@ -314,8 +314,9 @@ clist_fillpage(gx_device * dev, gs_gstate *pgs, gx_drawing_color *pdcolor)
     int code;
 
     /* flush previous contents */
-    if ((code = clist_close_writer_and_init_reader(cldev) < 0) ||
-        (code = clist_finish_page(dev, true)) < 0)
+    if ((code = clist_close_writer_and_init_reader(cldev) < 0))
+        return code;;
+    if ((code = clist_finish_page(dev, true)) < 0)
         return code;;
 
     pcls = cdev->states; /* Use any. */


Summary of changes:
 base/gxclrect.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)