[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1765-g7870f49

The ghostpdl branch, master has been updated
       via  7870f4951bcc6a153f317e3439e14d0e929fd231 (commit)
      from  1e6b2518ed4b130ad649b96bf914558e642e414d (commit)

----------------------------------------------------------------------
commit 7870f4951bcc6a153f317e3439e14d0e929fd231
Author: Michael Vrhel <[email protected]>
Date:   Mon Oct 28 10:37:46 2019 -0700

    Bug 701795: Segv due to image mask issue

diff --git a/base/gxblend.c b/base/gxblend.c
index 59d0dea..c07b2fb 100644
--- a/base/gxblend.c
+++ b/base/gxblend.c
@@ -3476,7 +3476,7 @@ do_compose_group(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf,
              overprint == 0) {
              /* Additive vs Subtractive makes no difference in normal blend mode with no spots */
         if (tos_isolated) {
-            if (has_mask || maskbuf) {/* 7% */
+            if (has_mask && maskbuf) {/* 7% */
                 /* AirPrint test case hits this */
                 if (maskbuf && maskbuf->rect.p.x <= x0 && maskbuf->rect.p.y <= y0 &&
                     maskbuf->rect.q.x >= x1 && maskbuf->rect.q.y >= y1) {
@@ -4246,7 +4246,7 @@ do_compose_group16(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf,
              overprint == 0) {
              /* Additive vs Subtractive makes no difference in normal blend mode with no spots */
         if (tos_isolated) {
-            if (has_mask || maskbuf) {/* 7% */
+            if (has_mask && maskbuf) {/* 7% */
                 /* AirPrint test case hits this */
                 if (maskbuf && maskbuf->rect.p.x <= x0 && maskbuf->rect.p.y <= y0 &&
                     maskbuf->rect.q.x >= x1 && maskbuf->rect.q.y >= y1)


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