SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-07-09 02:16:46 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Don't use MemoryStream.ToArray

Browse Source
This commit is contained in:
Matt Nadareski
2025-07-28 15:16:57 -04:00
parent 6a4d5bddeb
commit d54c88a01d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BinaryObjectScanner/FileType/MicrosoftCAB.cs
View File

@@ -1,6 +1,8 @@
using System;
using System.IO;
using BinaryObjectScanner.Interfaces;
using SabreTools.IO.Extensions;
#if (NET40_OR_GREATER || NETCOREAPP) && WINX86
using LibMSPackN;
#else
@@ -45,8 +47,8 @@ namespace BinaryObjectScanner.FileType
var folder = cabArchive.Model.Folders[f];
// Decompress the blocks, if possible
using var ms = DecompressBlocks(cabArchive, file, folder, f);
if (ms == null || ms.Length == 0)
using var blockStream = DecompressBlocks(cabArchive, file, folder, f);
if (blockStream == null || blockStream.Length == 0)
continue;
// Ensure files
@@ -59,8 +61,8 @@ namespace BinaryObjectScanner.FileType
{
try
{
byte[] fileData = new byte[compressedFile.FileSize];
Array.Copy(ms.ToArray(), compressedFile.FolderStartOffset, fileData, 0, compressedFile.FileSize);
blockStream.Seek(compressedFile.FolderStartOffset, SeekOrigin.Begin);
byte[] fileData = blockStream.ReadBytes((int)compressedFile.FileSize);
// Ensure directory separators are consistent
string fileName = compressedFile.Name!;
@@ -137,7 +139,7 @@ namespace BinaryObjectScanner.FileType
/// <summary>
/// Decompress all blocks for a folder
/// </summary>
private MemoryStream? DecompressBlocks(SabreTools.Serialization.Wrappers.MicrosoftCabinet cabArchive, string file, CFFOLDER? folder, int folderIndex)
private Stream? DecompressBlocks(SabreTools.Serialization.Wrappers.MicrosoftCabinet cabArchive, string file, CFFOLDER? folder, int folderIndex)
{
// Ensure data blocks
var dataBlocks = GetDataBlocks(cabArchive, file, folder, folderIndex);