Improve ACE resource governor check to validate before decompression

Copilot · gfs · Copilot · commit 4f4764353201 · 2026-02-06T18:30:12.000Z
Co-authored-by: gfs &lt;98900+gfs@users.noreply.github.com&gt;
diff --git a/RecursiveExtractor/Extractors/AceExtractor.cs b/RecursiveExtractor/Extractors/AceExtractor.cs
@@ -61,11 +61,10 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
                             continue;
                         }
 
+                        governor.CheckResourceGovernor(entry.Size);
                         var newFileEntry = await FileEntry.FromStreamAsync(name, aceReader.OpenEntryStream(), fileEntry, entry.CreatedTime, entry.LastModifiedTime, entry.LastAccessedTime, memoryStreamCutoff: options.MemoryStreamCutoff).ConfigureAwait(false);
                         if (newFileEntry != null)
                         {
-                            governor.CheckResourceGovernor(newFileEntry.Content.Length);
-
                             if (options.Recurse || topLevel)
                             {
                                 await foreach (var innerEntry in Context.ExtractAsync(newFileEntry, options, governor, false))
@@ -125,6 +124,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
                         FileEntry? newFileEntry = null;
                         try
                         {
+                            governor.CheckResourceGovernor(entry.Size);
                             var stream = aceReader.OpenEntryStream();
                             var name = entry.Key?.Replace('/', Path.DirectorySeparatorChar);
                             if (string.IsNullOrEmpty(name))
@@ -140,8 +140,6 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
                         }
                         if (newFileEntry != null)
                         {
-                            governor.CheckResourceGovernor(newFileEntry.Content.Length);
-
                             if (options.Recurse || topLevel)
                             {
                                 foreach (var innerEntry in Context.Extract(newFileEntry, options, governor, false))

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,10 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`61`	`61`	`continue;`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ governor.CheckResourceGovernor(entry.Size);`
`64`	`65`	`var newFileEntry = await FileEntry.FromStreamAsync(name, aceReader.OpenEntryStream(), fileEntry, entry.CreatedTime, entry.LastModifiedTime, entry.LastAccessedTime, memoryStreamCutoff: options.MemoryStreamCutoff).ConfigureAwait(false);`
`65`	`66`	`if (newFileEntry != null)`
`66`	`67`	`{`
`67`		`- governor.CheckResourceGovernor(newFileEntry.Content.Length);`
`68`		`-`
`69`	`68`	`if (options.Recurse \|\| topLevel)`
`70`	`69`	`{`
`71`	`70`	`await foreach (var innerEntry in Context.ExtractAsync(newFileEntry, options, governor, false))`
`@@ -125,6 +124,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti`
`125`	`124`	`FileEntry? newFileEntry = null;`
`126`	`125`	`try`
`127`	`126`	`{`
	`127`	`+ governor.CheckResourceGovernor(entry.Size);`
`128`	`128`	`var stream = aceReader.OpenEntryStream();`
`129`	`129`	`var name = entry.Key?.Replace('/', Path.DirectorySeparatorChar);`
`130`	`130`	`if (string.IsNullOrEmpty(name))`
`@@ -140,8 +140,6 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti`
`140`	`140`	`}`
`141`	`141`	`if (newFileEntry != null)`
`142`	`142`	`{`
`143`		`- governor.CheckResourceGovernor(newFileEntry.Content.Length);`
`144`		`-`
`145`	`143`	`if (options.Recurse \|\| topLevel)`
`146`	`144`	`{`
`147`	`145`	`foreach (var innerEntry in Context.Extract(newFileEntry, options, governor, false))`