Fix issue 241:CAB decompression not 64bit compatible.

diff --git a/libarchive/archive_read_support_format_cab.c b/libarchive/archive_read_support_format_cab.c
index d663e2e3c24f8359e2a7cbab2a4f80609790c8ff..b634ed394f35e8ed5b289f19790cd8bfa488fcea 100644 (file)
--- a/libarchive/archive_read_support_format_cab.c
+++ b/libarchive/archive_read_support_format_cab.c
@@ -2182,11 +2182,11 @@ lzx_translation(struct lzx_stream *strm, void *p, size_t size, uint32_t offset)
        end = b + size - 10;
        while (b < end && (b = memchr(b, 0xE8, end - b)) != NULL) {
                size_t i = b - (unsigned char *)p;
-               long cp, displacement, value;
+               int32_t cp, displacement, value;
 
                cp = offset + i;
                value = archive_le32dec(&b[1]);
-               if (value >= -cp && value < (long)ds->translation_size) {
+               if (value >= -cp && value < (int32_t)ds->translation_size) {
                        if (value >= 0)
                                displacement = value - cp;
                        else
@@ -2477,7 +2477,10 @@ lzx_read_blocks(struct lzx_stream *strm, int last)
                         */
                        /* Skip padding to align following field on
                         * 16-bit boundary. */
-                       lzx_br_consume_unalined_bits(br);
+                       if (br->cache_avail == 32 || br->cache_avail == 16)
+                               lzx_br_consume(br, 16);
+                       else
+                               lzx_br_consume_unalined_bits(br);
                        /* Preparation to read repeated offsets R0,R1 and R2. */
                        ds->rbytes_avail = 0;
                        ds->state = ST_RD_R0;