Merge pull request #202 from seesharper/bugfix-stackoverflow-on-dispo…

…seasync Ensure DisposeAsync does not cause stack overflow
seesharper · Dec 31, 2022 · 3cc0cb6 · 3cc0cb6
2 parents 415dc63 + 93ec480
commit 3cc0cb6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/LightInject.Microsoft.DependencyInjection.Tests/AsyncDisposableTests.cs b/src/LightInject.Microsoft.DependencyInjection.Tests/AsyncDisposableTests.cs
@@ -40,7 +40,18 @@ public async Task ShouldDisposeAsyncDisposableFromRootScope()
             asyncDisposable = serviceProvider.GetService<AsyncDisposable>();
             await ((IAsyncDisposable)serviceProvider).DisposeAsync();
 
+            // Call it twice to ensure only disposed once. 
+            await ((IAsyncDisposable)serviceProvider).DisposeAsync();
+
+
             Assert.Contains(asyncDisposable, disposedObjects);
+            Assert.Single(disposedObjects);
+        }
+
+        [Fact]
+        public async Task ShouldHandleDisposeAsyncOnServiceProvider()
+        {
+
         }
     }
 

diff --git a/src/LightInject.Microsoft.DependencyInjection/LightInject.Microsoft.DependencyInjection.cs b/src/LightInject.Microsoft.DependencyInjection/LightInject.Microsoft.DependencyInjection.cs
@@ -349,7 +349,16 @@ public void Dispose()
 #if USE_ASYNCDISPOSABLE
 
     public ValueTask DisposeAsync()
-        => scope.DisposeAsync();
+    {
+        if (isDisposed)
+        {
+            return ValueTask.CompletedTask;
+        }
+
+        isDisposed = true;
+
+        return scope.DisposeAsync();
+    }
 #endif
 
     /// <summary>