Handle null streams in catch for FetchStream/Async

jstedfast · Jan 7, 2024 · 86c4c08 · 86c4c08
1 parent a6eb2fe
commit 86c4c08
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/MailKit/Net/Imap/ImapFolderFetch.cs b/MailKit/Net/Imap/ImapFolderFetch.cs
@@ -2047,7 +2047,7 @@ void FetchStream (ImapEngine engine, ImapCommand ic, int index)
 
 							stream.Position = 0;
 						} catch {
-							stream.Dispose ();
+							stream?.Dispose ();
 							throw;
 						} finally {
 							ArrayPool<byte>.Shared.Return (buf);
@@ -2067,7 +2067,7 @@ void FetchStream (ImapEngine engine, ImapCommand ic, int index)
 							ctx.Report (nread, size);
 							stream.Position = 0;
 						} catch {
-							stream.Dispose ();
+							stream?.Dispose ();
 							throw;
 						}
 						break;
@@ -2290,7 +2290,7 @@ async Task FetchStreamAsync (ImapEngine engine, ImapCommand ic, int index)
 
 							stream.Position = 0;
 						} catch {
-							stream.Dispose ();
+							stream?.Dispose ();
 							throw;
 						} finally {
 							ArrayPool<byte>.Shared.Return (buf);
@@ -2310,7 +2310,7 @@ async Task FetchStreamAsync (ImapEngine engine, ImapCommand ic, int index)
 							ctx.Report (nread, size);
 							stream.Position = 0;
 						} catch {
-							stream.Dispose ();
+							stream?.Dispose ();
 							throw;
 						}
 						break;