Merge r1022 and r1023 into 1.1 (blame rmccue if these are broken).

simplepie.inc

@@ -8382,7 +8382,7 @@ class SimplePie_gzdecode
 			$this->flags = ord($this->compressed_data[3]);
 
 			// FLG bits above (1 << 4) are reserved
-			if ($flg > 0x1F)
+			if ($this->flags > 0x1F)
 			{
 				return false;
 			}
@@ -8514,17 +8514,17 @@ class SimplePie_gzdecode
 			}
 
 			// Check CRC of data
-			$crc = current(unpack('N', substr($this->compressed_data, $this->position, 4)));
+			$crc = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
 			$this->position += 4;
-			if (extension_loaded('hash') && hexdec(hash('crc32b', $this->data)) !== $crc)
+			/*if (extension_loaded('hash') && sprintf('%u', current(unpack('V', hash('crc32b', $this->data)))) !== sprintf('%u', $crc))
 			{
 				return false;
-			}
+			}*/
 
 			// Check ISIZE of data
-			$isize = current(unpack('N', substr($this->compressed_data, $this->position, 4)));
+			$isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
 			$this->position += 4;
-			if (strlen($this->data) & 0xFFFFFFFF !== $isize)
+			if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize))
 			{
 				return false;
 			}