Merge pull request #738 from akarnokd/ObserveOnLongRunFix

4.x: Fix long sequence ObserveOn StackOverflowException upon Dispose

Author: danielcweber

Rx.NET/Source/src/System.Reactive/Internal/ScheduledObserver.cs

@@ -536,7 +536,10 @@ private IDisposable DrainShortRunning(IScheduler recursiveScheduler)
 
             if (Interlocked.Decrement(ref _wip) != 0)
             {
-                return recursiveScheduler.Schedule(this, DRAIN_SHORT_RUNNING);
+                // Don't return the disposable of Schedule() because that may chain together
+                // a long string of ScheduledItems causing StackOverflowException upon Dispose()
+                var d = recursiveScheduler.Schedule(this, DRAIN_SHORT_RUNNING);
+                Disposable.TrySetMultiple(ref _task, d);
             }
             return Disposable.Empty;
         }

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ObserveOnTest.cs

@@ -645,6 +645,19 @@ public void ObserveOn_SynchronizationContext_Simple()
             );
         }
 
+        [Fact]
+        public void ObserveOn_EventLoop_Long()
+        {
+            var _scheduler1 = new EventLoopScheduler();
+            var N = 1_000_000;
+
+            var cde = new CountdownEvent(1);
+
+            Observable.Range(1, N).ObserveOn(_scheduler1)
+                .Subscribe(v => { }, () => cde.Signal());
+
+            Assert.True(cde.Wait(5000), "Timeout!");
+        }
     }
 
     internal class MyCtx : SynchronizationContext