Changeset 7314

Timestamp:

03/15/2008 06:33:16 PM (17 years ago)

Author:

westi

Message:

Chase down some 64bit dragons. Ensure that we only ever create a 32bit number to compare to the 32bit magic number when searching a zip file for the end of the directory record. See #6236.

File:

• trunk/wp-admin/includes/class-pclzip.php (modified) (1 diff)

trunk/wp-admin/includes/class-pclzip.php

@@ -4471 +4471 @@
 
         // -----  Add the byte
-        $v_bytes = ($v_bytes << 8) | Ord($v_byte);
+        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
 
         // ----- Compare the bytes