Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Side by Side Diff: sdk/lib/async/stream_impl.dart

Issue 896793002: Avoid crashing when a closed StreamIterator is cancelled (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Follow Lasse's suggestion Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | tests/lib/async/stream_iterator_double_cancel_test.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 part of dart.async; 5 part of dart.async;
6 6
7 /** Abstract and private interface for a place to put events. */ 7 /** Abstract and private interface for a place to put events. */
8 abstract class _EventSink<T> { 8 abstract class _EventSink<T> {
9 void _add(T data); 9 void _add(T data);
10 void _addError(Object error, StackTrace stackTrace); 10 void _addError(Object error, StackTrace stackTrace);
(...skipping 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after
1022 /** Clears up the internal state when the iterator ends. */ 1022 /** Clears up the internal state when the iterator ends. */
1023 void _clear() { 1023 void _clear() {
1024 _subscription = null; 1024 _subscription = null;
1025 _futureOrPrefetch = null; 1025 _futureOrPrefetch = null;
1026 _current = null; 1026 _current = null;
1027 _state = _STATE_DONE; 1027 _state = _STATE_DONE;
1028 } 1028 }
1029 1029
1030 Future cancel() { 1030 Future cancel() {
1031 StreamSubscription subscription = _subscription; 1031 StreamSubscription subscription = _subscription;
1032 if (subscription == null) return null;
1032 if (_state == _STATE_MOVING) { 1033 if (_state == _STATE_MOVING) {
1033 _Future<bool> hasNext = _futureOrPrefetch; 1034 _Future<bool> hasNext = _futureOrPrefetch;
1034 _clear(); 1035 _clear();
1035 hasNext._complete(false); 1036 hasNext._complete(false);
1036 } else { 1037 } else {
1037 _clear(); 1038 _clear();
1038 } 1039 }
1039 return subscription.cancel(); 1040 return subscription.cancel();
1040 } 1041 }
1041 1042
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 _Future<bool> hasNext = _futureOrPrefetch; 1074 _Future<bool> hasNext = _futureOrPrefetch;
1074 _clear(); 1075 _clear();
1075 hasNext._complete(false); 1076 hasNext._complete(false);
1076 return; 1077 return;
1077 } 1078 }
1078 _subscription.pause(); 1079 _subscription.pause();
1079 _futureOrPrefetch = null; 1080 _futureOrPrefetch = null;
1080 _state = _STATE_EXTRA_DONE; 1081 _state = _STATE_EXTRA_DONE;
1081 } 1082 }
1082 } 1083 }
OLDNEW
« no previous file with comments | « no previous file | tests/lib/async/stream_iterator_double_cancel_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698