shithub: jbig2

Info  •  Files  •  Log  •  Branches

Bug 690870: This patch prevents the image compositing occurring if the src is outside of the clip region.

--- a/jbig2_image.c

+++ b/jbig2_image.c

@@ -198,7 +198,7 @@

     w = src->width;

     h = src->height;

     ss = src->data;

-    /* FIXME: this isn't sufficient for the < 0 cases */

+

     if (x < 0) { w += x; x = 0; }

     if (y < 0) { h += y; y = 0; }

     w = (x + w < dst->width) ? w : dst->width - x;

@@ -208,6 +208,15 @@

       "compositing %dx%d at (%d, %d) after clipping\n",

         w, h, x, y);

 #endif

+

+    /* check for zero clipping region */

+    if ((w <= 0) || (h <= 0))

+    {

+#ifdef JBIG2_DEBUG

+        jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, -1, "zero clipping region");

+#endif

+        return 0;

+    }

 #if 0

     /* special case complete/strip replacement */