Fix a type promotion bug discivered and analyzed by Alan Modra

<amodra@bigpond.net.au>, which caused false checksum errors


git-svn-id: svn://busybox.net/trunk/busybox@2917 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 2 insertions, 2 deletions

diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 7de28930a..40b8af427 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -997,7 +997,7 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
         fread(buf, 1, 8, in_file);
 
         /* Validate decompression - crc */
-        if (((buf[0] | (buf[1] << 8)) |((buf[2] | (buf[3] << 8)) << 16)) != (crc ^ 0xffffffffL)) {
+        if ((unsigned int)((buf[0] | (buf[1] << 8)) |((buf[2] | (buf[3] << 8)) << 16)) != (crc ^ 0xffffffffL)) {
                 error_msg("invalid compressed data--crc error");
         }
         /* Validate decompression - size */
diff --git a/archival/libunarchive/unzip.c b/archival/libunarchive/unzip.c
index 7de28930a..40b8af427 100644
--- a/archival/libunarchive/unzip.c
+++ b/archival/libunarchive/unzip.c
@@ -997,7 +997,7 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
         fread(buf, 1, 8, in_file);
 
         /* Validate decompression - crc */
-        if (((buf[0] | (buf[1] << 8)) |((buf[2] | (buf[3] << 8)) << 16)) != (crc ^ 0xffffffffL)) {
+        if ((unsigned int)((buf[0] | (buf[1] << 8)) |((buf[2] | (buf[3] << 8)) << 16)) != (crc ^ 0xffffffffL)) {
                 error_msg("invalid compressed data--crc error");
         }
         /* Validate decompression - size */