Sophie

Sophie

distrib > Mageia > 6 > x86_64 > by-pkgid > 2a14ab28d3513e03783c49ebdf4ee8f9 > files > 6

openjpeg2-2.2.0-1.4.mga6.src.rpm

--- openjpeg-2.2.0/src/bin/jp2/convertbmp.c.orig	2019-01-01 13:49:48.433681350 -0500
+++ openjpeg-2.2.0/src/bin/jp2/convertbmp.c	2019-01-01 13:50:02.709606669 -0500
@@ -534,14 +534,14 @@ static OPJ_BOOL bmp_read_raw_data(FILE*
 static OPJ_BOOL bmp_read_rle8_data(FILE* IN, OPJ_UINT8* pData,
                                    OPJ_UINT32 stride, OPJ_UINT32 width, OPJ_UINT32 height)
 {
-    OPJ_UINT32 x, y;
+    OPJ_UINT32 x, y, written;
     OPJ_UINT8 *pix;
     const OPJ_UINT8 *beyond;
 
     beyond = pData + stride * height;
     pix = pData;
 
-    x = y = 0U;
+    x = y = written = 0U;
     while (y < height) {
         int c = getc(IN);
 
@@ -552,6 +552,7 @@ static OPJ_BOOL bmp_read_rle8_data(FILE*
             for (j = 0; (j < c) && (x < width) &&
                     ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) {
                 *pix = c1;
+                written++;
             }
         } else {
             c = getc(IN);
@@ -573,6 +574,7 @@ static OPJ_BOOL bmp_read_rle8_data(FILE*
                         ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) {
                     OPJ_UINT8 c1 = (OPJ_UINT8)getc(IN);
                     *pix = c1;
+                    written++;
                 }
                 if ((OPJ_UINT32)c & 1U) { /* skip padding byte */
                     getc(IN);
@@ -580,6 +582,12 @@ static OPJ_BOOL bmp_read_rle8_data(FILE*
             }
         }
     }/* while() */
+
+    if (written != width * height) {
+        fprintf(stderr, "warning, image's actual size does not match advertized one\n");
+        return OPJ_FALSE;
+    }
+
     return OPJ_TRUE;
 }