Address code review: make sync non-indexed entry extraction pattern consistent with async

Copilot · gfs · Copilot · commit 34563cb45271 · 2026-02-10T23:30:05.000Z
Co-authored-by: gfs &lt;98900+gfs@users.noreply.github.com&gt;
diff --git a/RecursiveExtractor/Extractors/ZipExtractor.cs b/RecursiveExtractor/Extractors/ZipExtractor.cs
@@ -408,7 +408,7 @@ private IEnumerable<FileEntry> YieldNonIndexedEntries(
 
                     Logger.Info("Discovered non-indexed ZIP entry '{0}' in {1}", readerKey, parentEntry.FullPath);
 
-                    Stream payload;
+                    Stream? payload = null;
                     try
                     {
                         using var readerStream = forwardReader.OpenEntryStream();
@@ -419,9 +419,10 @@ private IEnumerable<FileEntry> YieldNonIndexedEntries(
                     catch (Exception ex)
                     {
                         Logger.Debug(Extractor.FAILED_PARSING_ERROR_MESSAGE_STRING, ArchiveFileType.ZIP, parentEntry.FullPath, readerKey, ex.GetType());
-                        payload = new MemoryStream();
                     }
 
+                    payload ??= new MemoryStream();
+
                     var entryName = readerKey.Replace('/', Path.DirectorySeparatorChar);
                     var discovered = new FileEntry(entryName, payload, parentEntry, memoryStreamCutoff: options.MemoryStreamCutoff)
                     {

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ private IEnumerable<FileEntry> YieldNonIndexedEntries(`
`408`	`408`
`409`	`409`	`Logger.Info("Discovered non-indexed ZIP entry '{0}' in {1}", readerKey, parentEntry.FullPath);`
`410`	`410`
`411`		`- Stream payload;`
	`411`	`+ Stream? payload = null;`
`412`	`412`	`try`
`413`	`413`	`{`
`414`	`414`	`using var readerStream = forwardReader.OpenEntryStream();`
`@@ -419,9 +419,10 @@ private IEnumerable<FileEntry> YieldNonIndexedEntries(`
`419`	`419`	`catch (Exception ex)`
`420`	`420`	`{`
`421`	`421`	`Logger.Debug(Extractor.FAILED_PARSING_ERROR_MESSAGE_STRING, ArchiveFileType.ZIP, parentEntry.FullPath, readerKey, ex.GetType());`
`422`		`- payload = new MemoryStream();`
`423`	`422`	`}`
`424`	`423`
	`424`	`+ payload ??= new MemoryStream();`
	`425`	`+`
`425`	`426`	`var entryName = readerKey.Replace('/', Path.DirectorySeparatorChar);`
`426`	`427`	`var discovered = new FileEntry(entryName, payload, parentEntry, memoryStreamCutoff: options.MemoryStreamCutoff)`
`427`	`428`	`{`