shithub: jbig2

Info  •  Files  •  Log  •  Branches

Fixes bug #689870 - add proper big endian number accessors.

Previously only an unsigned accessor was provided and it was being
used to read both signed and unsigned quantities.

--- a/jbig2.c

+++ b/jbig2.c

@@ -160,16 +160,33 @@

   return result;

 }

+#define get_uint16(bptr)\

+  (((bptr)[0] << 8) | (bptr)[1])

+#define get_int16(bptr)\

+  (((int)get_uint16(bptr) ^ 0x8000) - 0x8000)

+

+int16_t

+jbig2_get_int16(const byte *bptr)

+{	

+    return get_int16(bptr);

+}

+

+uint16_t

+jbig2_get_uint16(const byte *bptr)

+{	

+    return get_uint16(bptr);

+}

+

 int32_t

-jbig2_get_int32 (const byte *buf)

-{

-  return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];

+jbig2_get_int32(const byte *bptr)

+{	

+    return ((int32_t)get_int16(bptr) << 16) | get_uint16(bptr + 2);

 }

-int16_t

-jbig2_get_int16 (const byte *buf)

-{

-  return (buf[0] << 8) | buf[1];

+uint32_t

+jbig2_get_uint32(const byte *bptr)

+{	

+    return ((uint32_t)get_uint16(bptr) << 16) | get_uint16(bptr + 2);

 }

--- a/jbig2_halftone.c

+++ b/jbig2_halftone.c

@@ -218,7 +218,7 @@

   params.HDTEMPLATE = (flags & 6) >> 1;

   params.HDPW = segment_data[1];

   params.HDPH = segment_data[2];

-  params.GRAYMAX = jbig2_get_int32(segment_data + 3);

+  params.GRAYMAX = jbig2_get_uint32(segment_data + 3);

   offset += 7;

   jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,

@@ -320,8 +320,8 @@

   /* Figure 43 */

   if (segment->data_length - offset < 16) goto too_short;

-  params.HGW = jbig2_get_int32(segment_data + offset);

-  params.HGH = jbig2_get_int32(segment_data + offset + 4);

+  params.HGW = jbig2_get_uint32(segment_data + offset);

+  params.HGH = jbig2_get_uint32(segment_data + offset + 4);

   params.HGX = jbig2_get_int32(segment_data + offset + 8);

   params.HGY = jbig2_get_int32(segment_data + offset + 12);

   offset += 16;

@@ -328,8 +328,8 @@

   /* Figure 44 */

   if (segment->data_length - offset < 4) goto too_short;

-  params.HRX = jbig2_get_int16(segment_data + offset);

-  params.HRY = jbig2_get_int16(segment_data + offset + 2);

+  params.HRX = jbig2_get_uint16(segment_data + offset);

+  params.HRY = jbig2_get_uint16(segment_data + offset + 2);

   offset += 4;

   jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,

--- a/jbig2_page.c

+++ b/jbig2_page.c

@@ -105,11 +105,11 @@

     }

     /* 7.4.8.x */

-    page->width = jbig2_get_int32(segment_data);

-    page->height = jbig2_get_int32(segment_data + 4);

+    page->width = jbig2_get_uint32(segment_data);

+    page->height = jbig2_get_uint32(segment_data + 4);

-    page->x_resolution = jbig2_get_int32(segment_data + 8);

-    page->y_resolution = jbig2_get_int32(segment_data + 12);

+    page->x_resolution = jbig2_get_uint32(segment_data + 8);

+    page->y_resolution = jbig2_get_uint32(segment_data + 12);

     page->flags = segment_data[16];

     /* 7.4.8.6 */

--- a/jbig2_priv.h

+++ b/jbig2_priv.h

@@ -73,8 +73,14 @@

   Jbig2Page *pages;

 };

+uint32_t

+jbig2_get_uint32(const byte *bptr);

+

 int32_t

 jbig2_get_int32 (const byte *buf);

+

+uint16_t

+jbig2_get_uint16(const byte *bptr);

 int16_t

 jbig2_get_int16 (const byte *buf);

--- a/jbig2_segment.c

+++ b/jbig2_segment.c

@@ -46,7 +46,7 @@

   result = jbig2_new(ctx, Jbig2Segment, 1);

   /* 7.2.2 */

-  result->number = jbig2_get_int32(buf);

+  result->number = jbig2_get_uint32(buf);

   /* 7.2.3 */

   result->flags = buf[4];

@@ -55,7 +55,7 @@

   rtscarf = buf[5];

   if ((rtscarf & 0xe0) == 0xe0)

     {

-      rtscarf_long = jbig2_get_int32(buf + 5);

+      rtscarf_long = jbig2_get_uint32(buf + 5);

       referred_to_segment_count = rtscarf_long & 0x1fffffff;

       offset = 5 + 4 + (referred_to_segment_count + 1) / 8;

     }

@@ -89,8 +89,8 @@

       for (i = 0; i < referred_to_segment_count; i++) {

         referred_to_segments[i] =

           (referred_to_segment_size == 1) ? buf[offset] :

-          (referred_to_segment_size == 2) ? jbig2_get_int16(buf+offset) :

-            jbig2_get_int32(buf + offset);

+          (referred_to_segment_size == 2) ? jbig2_get_uint16(buf+offset) :

+            jbig2_get_uint32(buf + offset);

         offset += referred_to_segment_size;

         jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, result->number,

             "segment %d refers to segment %d",

@@ -105,7 +105,7 @@

   /* 7.2.6 */

   if (result->flags & 0x40) {

-	result->page_association = jbig2_get_int32(buf + offset);

+	result->page_association = jbig2_get_uint32(buf + offset);

 	offset += 4;

   } else {

 	result->page_association = buf[offset++];

@@ -115,7 +115,7 @@

   	result->number, result->page_association);

   /* 7.2.7 */

-  result->data_length = jbig2_get_int32(buf + offset);

+  result->data_length = jbig2_get_uint32(buf + offset);

   *p_header_size = offset + 4;

   /* no body parsing results yet */

@@ -200,7 +200,7 @@

     uint32_t type;

     bool reserved, dependent, necessary;

-    type = jbig2_get_int32(segment_data);

+    type = jbig2_get_uint32(segment_data);

     reserved = type & 0x20000000;

     dependent = type & 0x40000000;

--- a/jbig2_symbol_dict.c

+++ b/jbig2_symbol_dict.c

@@ -758,7 +758,7 @@

     goto too_short;

   /* 7.4.2.1.1 */

-  flags = jbig2_get_int16(segment_data);

+  flags = jbig2_get_uint16(segment_data);

   params.SDHUFF = flags & 1;

   params.SDREFAGG = (flags >> 1) & 1;

   params.SDTEMPLATE = (flags >> 10) & 3;

@@ -889,9 +889,9 @@

     goto too_short;

   /* 7.4.2.1.4 */

-  params.SDNUMEXSYMS = jbig2_get_int32(segment_data + offset);

+  params.SDNUMEXSYMS = jbig2_get_uint32(segment_data + offset);

   /* 7.4.2.1.5 */

-  params.SDNUMNEWSYMS = jbig2_get_int32(segment_data + offset + 4);

+  params.SDNUMNEWSYMS = jbig2_get_uint32(segment_data + offset + 4);

   offset += 8;

   jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,

--- a/jbig2_text.c

+++ b/jbig2_text.c

@@ -429,7 +429,7 @@

     offset += 17;

     /* 7.4.3.1.1 */

-    flags = jbig2_get_int16(segment_data + offset);

+    flags = jbig2_get_uint16(segment_data + offset);

     offset += 2;

     jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,

@@ -456,7 +456,7 @@

     if (params.SBHUFF)	/* Huffman coding */

       {

         /* 7.4.3.1.2 */

-        huffman_flags = jbig2_get_int16(segment_data + offset);

+        huffman_flags = jbig2_get_uint16(segment_data + offset);

         offset += 2;

         if (huffman_flags & 0x8000)

@@ -480,7 +480,7 @@

       }

     /* 7.4.3.1.4 */

-    params.SBNUMINSTANCES = jbig2_get_int32(segment_data + offset);

+    params.SBNUMINSTANCES = jbig2_get_uint32(segment_data + offset);

     offset += 4;

     if (params.SBHUFF) {