Avoid crashing when a closed StreamIterator is cancelled

sdk/lib/async/stream_impl.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.async;
 
 /** Abstract and private interface for a place to put events. */
 abstract class _EventSink<T> {
   void _add(T data);
   void _addError(Object error, StackTrace stackTrace);
@@ skipping 1010 matching lines @@
 
   /** Clears up the internal state when the iterator ends. */
   void _clear() {
     _subscription = null;
     _futureOrPrefetch = null;
     _current = null;
     _state = _STATE_DONE;
   }
 
   Future cancel() {
     StreamSubscription subscription = _subscription;

[Lasse Reichstein Nielsen, 2015/02/04 10:03:42]

I think it would better to just do:
  if (subscription == null) return null;
here. The _subscription is only set to null in _clear, but that also sets _state
to _STATE_DONE, which will never change again. So, if _subscription is null,
then we know that all we will do is call _clear again before returning null,
which will do nothing.

[sigurdm, 2015/02/04 10:23:57]

Done.
Thanks!

     if (_state == _STATE_MOVING) {
       _Future<bool> hasNext = _futureOrPrefetch;
       _clear();
       hasNext._complete(false);
     } else {
       _clear();
     }
-    return subscription.cancel();
+    return (subscription == null) ? null : subscription.cancel();
   }
 
   void _onData(T data) {
     if (_state == _STATE_MOVING) {
       _current = data;
       _Future<bool> hasNext = _futureOrPrefetch;
       _futureOrPrefetch = null;
       _state = _STATE_FOUND;
       hasNext._complete(true);
       return;
@@ skipping 23 matching lines @@
       _Future<bool> hasNext = _futureOrPrefetch;
       _clear();
       hasNext._complete(false);
       return;
     }
     _subscription.pause();
     _futureOrPrefetch = null;
     _state = _STATE_EXTRA_DONE;
   }
 }