Fixes use-after-free in MojoDemuxerStreamImpl.

media/mojo/clients/mojo_renderer_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_CLIENTS_MOJO_RENDERER_IMPL_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_RENDERER_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
+#include "media/base/demuxer_stream.h"
 #include "media/base/renderer.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class DemuxerStreamProvider;
+class MojoDemuxerStreamImpl;
 class VideoOverlayFactory;
 class VideoRendererSink;
 
 // A media::Renderer that proxies to a mojom::Renderer. That
 // mojom::Renderer proxies back to the MojoRendererImpl via the
 // mojom::RendererClient interface.
 //
 // This class can be created on any thread, where the |remote_renderer| is
 // connected and passed in the constructor. Then Initialize() will be called on
 // the |task_runner| and starting from that point this class is bound to the
@@ skipping 34 matching lines @@
   void OnVideoOpacityChange(bool opaque) override;
 
   // Binds |remote_renderer_| to the mojo message pipe. Can be called multiple
   // times. If an error occurs during connection, OnConnectionError will be
   // called asynchronously.
   void BindRemoteRendererIfNeeded();
 
   // Callback for connection error on |remote_renderer_|.
   void OnConnectionError();
 
+  // Callback for connection error on |audio_stream_| and |video_stream_|.
+  void OnDemuxerStreamConnectionError(DemuxerStream::Type type);
+
   // Callbacks for |remote_renderer_| methods.
   void OnInitialized(media::RendererClient* client, bool success);
   void OnFlushed();
   void OnCdmAttached(bool success);
 
   void CancelPendingCallbacks();
 
   // |task_runner| on which all methods are invoked, except for GetMediaTime(),
   // which can be called on any thread.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // Overlay factory used to create overlays for video frames rendered
   // by the remote renderer.
   std::unique_ptr<VideoOverlayFactory> video_overlay_factory_;
 
   // Video frame overlays are rendered onto this sink.
   // Rendering of a new overlay is only needed when video natural size changes.
   VideoRendererSink* video_renderer_sink_ = nullptr;
 
   // Provider of audio/video DemuxerStreams. Must be valid throughout the
   // lifetime of |this|.
   DemuxerStreamProvider* demuxer_stream_provider_ = nullptr;
 
   // Client of |this| renderer passed in Initialize.
   media::RendererClient* client_ = nullptr;
 
+  // Mojo demuxer streams.
+  // Owned by MojoRendererImpl instead of remote mojom::Renderer
+  // becuase these demuxer streams need to be destroyed as soon as |this| is
+  // destroyed. The local demuxer streams returned by DemuxerStreamProvider
+  // cannot be used after |this| is destroyed.
+  // TODO(alokp): Add tests for MojoDemuxerStreamImpl.
+  std::unique_ptr<MojoDemuxerStreamImpl> audio_stream_;
+  std::unique_ptr<MojoDemuxerStreamImpl> video_stream_;
+
   // This class is constructed on one thread and used exclusively on another
   // thread. This member is used to safely pass the RendererPtr from one thread
   // to another. It is set in the constructor and is consumed in Initialize().
   mojom::RendererPtrInfo remote_renderer_info_;
 
   // Remote Renderer, bound to |task_runner_| during Initialize().
   mojom::RendererPtr remote_renderer_;
 
   // Binding for RendererClient, bound to the |task_runner_|.
   mojo::Binding<RendererClient> binding_;
 
   bool encountered_error_ = false;
 
   PipelineStatusCB init_cb_;
   base::Closure flush_cb_;
   CdmAttachedCB cdm_attached_cb_;
 
   // Lock used to serialize access for |time_|.
   mutable base::Lock lock_;
   base::TimeDelta time_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_RENDERER_IMPL_H_