Merge pull request #2 from hindercanrun/main

fix big ff's

Author: meowica

src/unlinker.cpp

@@ -76,6 +76,19 @@ inline const char* XAssetTypeToString(int type)
 	return "unknown";
 }
 
+// TODO: Move this into compression.hpp I guess
+size_t find_zlib_header(const unsigned char* data, size_t len)
+{
+	for (size_t i = 0; i + 1 < len; i++)
+	{
+		if (data[i] == 0x78 && (data[i + 1] == 0x01 || data[i + 1] == 0x9C || data[i + 1] == 0xDA))
+		{
+			return i;
+		}
+	}
+	return SIZE_MAX;
+}
+
 int unlink_fastfile(const std::string& infile, const std::string& outdir)
 {
 	std::ifstream fin(infile, std::ios::binary);
@@ -103,11 +116,17 @@ int unlink_fastfile(const std::string& infile, const std::string& outdir)
 	}
 	fin.close();
 
-	size_t offset = 38;
+	size_t offset = find_zlib_header(data.get(), flen);
+	if (offset == SIZE_MAX)
+	{
+		std::cerr << "No zlib stream found\n";
+		return 1;
+	}
+
 	unsigned char* comp = data.get() + offset;
 	size_t comp_len = flen - offset;
 
-	auto decompressed = compression::decompress_data(comp, comp_len, 50 * 1024 * 1024);
+	auto decompressed = compression::decompress_data(comp, comp_len, static_cast<size_t>(50 * 1024) * 1024);
 	if (decompressed.empty())
 	{
 		std::cerr << "Decompression failed" << std::endl;