Merge pull request #1177 from hez2010/master

Fix infinite recursive generics in CatchScheduler
dotnet · Apr 2, 2020 · f867e71 · f867e71
2 parents 9199d92 + a4bc99f
commit f867e71
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs
@@ -108,7 +108,8 @@ public PeriodicallyScheduledWorkItem(CatchSchedulerPeriodic scheduler, TState st
                     _catchScheduler = scheduler;
                     _action = action;
 
-                    Disposable.SetSingle(ref _cancel, scheduler._scheduler.SchedulePeriodic((@this: this, state), period, tuple => tuple.@this?.Tick(tuple.state) ?? default));
+                    // Note that avoiding closure allocation here would introduce infinite generic recursion over the TState argument
+                    Disposable.SetSingle(ref _cancel, scheduler._scheduler.SchedulePeriodic(state, period, state1 => this.Tick(state1).state ?? default));
                 }
 
                 public void Dispose()