-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Flowable.blockingSubscribe is unbounded and can lead to OOME
- Loading branch information
1 parent
5f1ce20
commit 74e7cde
Showing
7 changed files
with
725 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
src/main/java/io/reactivex/internal/subscribers/BoundedSubscriber.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| /** | ||
| * Copyright (c) 2016-present, RxJava Contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in | ||
| * compliance with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is | ||
| * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See | ||
| * the License for the specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.reactivex.internal.subscribers; | ||
|
|
||
| import io.reactivex.FlowableSubscriber; | ||
| import io.reactivex.disposables.Disposable; | ||
| import io.reactivex.exceptions.CompositeException; | ||
| import io.reactivex.exceptions.Exceptions; | ||
| import io.reactivex.functions.Action; | ||
| import io.reactivex.functions.Consumer; | ||
| import io.reactivex.internal.functions.Functions; | ||
| import io.reactivex.internal.subscriptions.SubscriptionHelper; | ||
| import io.reactivex.observers.LambdaConsumerIntrospection; | ||
| import io.reactivex.plugins.RxJavaPlugins; | ||
| import org.reactivestreams.Subscription; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| public final class BoundedSubscriber<T> extends AtomicReference<Subscription> | ||
| implements FlowableSubscriber<T>, Subscription, Disposable, LambdaConsumerIntrospection { | ||
|
|
||
| private static final long serialVersionUID = -7251123623727029452L; | ||
| final Consumer<? super T> onNext; | ||
| final Consumer<? super Throwable> onError; | ||
| final Action onComplete; | ||
| final Consumer<? super Subscription> onSubscribe; | ||
|
|
||
| final int bufferSize; | ||
| int consumed; | ||
| final int limit; | ||
|
|
||
| public BoundedSubscriber(Consumer<? super T> onNext, Consumer<? super Throwable> onError, | ||
| Action onComplete, | ||
| Consumer<? super Subscription> onSubscribe) { | ||
| super(); | ||
| this.onNext = onNext; | ||
| this.onError = onError; | ||
| this.onComplete = onComplete; | ||
| this.onSubscribe = onSubscribe; | ||
| this.bufferSize = ((Functions.BoundedConsumer) onSubscribe).getBufferSize(); | ||
| this.limit = bufferSize - (bufferSize >> 2); | ||
| } | ||
|
|
||
| @Override | ||
| public void onSubscribe(Subscription s) { | ||
| if (SubscriptionHelper.setOnce(this, s)) { | ||
| try { | ||
| onSubscribe.accept(this); | ||
| } catch (Throwable e) { | ||
| Exceptions.throwIfFatal(e); | ||
| s.cancel(); | ||
| onError(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onNext(T t) { | ||
| if (!isDisposed()) { | ||
| try { | ||
| onNext.accept(t); | ||
|
|
||
| int c = consumed + 1; | ||
| if (c == limit) { | ||
| consumed = 0; | ||
| get().request(limit); | ||
| } else { | ||
| consumed = c; | ||
| } | ||
| } catch (Throwable e) { | ||
| Exceptions.throwIfFatal(e); | ||
| get().cancel(); | ||
| onError(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(Throwable t) { | ||
| if (get() != SubscriptionHelper.CANCELLED) { | ||
| lazySet(SubscriptionHelper.CANCELLED); | ||
| try { | ||
| onError.accept(t); | ||
| } catch (Throwable e) { | ||
| Exceptions.throwIfFatal(e); | ||
| RxJavaPlugins.onError(new CompositeException(t, e)); | ||
| } | ||
| } else { | ||
| RxJavaPlugins.onError(t); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onComplete() { | ||
| if (get() != SubscriptionHelper.CANCELLED) { | ||
| lazySet(SubscriptionHelper.CANCELLED); | ||
| try { | ||
| onComplete.run(); | ||
| } catch (Throwable e) { | ||
| Exceptions.throwIfFatal(e); | ||
| RxJavaPlugins.onError(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void dispose() { | ||
| cancel(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isDisposed() { | ||
| return get() == SubscriptionHelper.CANCELLED; | ||
| } | ||
|
|
||
| @Override | ||
| public void request(long n) { | ||
| get().request(n); | ||
| } | ||
|
|
||
| @Override | ||
| public void cancel() { | ||
| SubscriptionHelper.cancel(this); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasCustomOnError() { | ||
| return onError != Functions.ON_ERROR_MISSING; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.