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

Side by Side Diff: media/mojo/clients/mojo_demuxer_stream_impl.h

Issue 2075193002: Fixes use-after-free in MojoDemuxerStreamImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 years, 6 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
« no previous file with comments | « no previous file | media/mojo/clients/mojo_renderer_impl.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_MOJO_CLIENTS_MOJO_DEMUXER_STREAM_IMPL_H_ 5 #ifndef MEDIA_MOJO_CLIENTS_MOJO_DEMUXER_STREAM_IMPL_H_
6 #define MEDIA_MOJO_CLIENTS_MOJO_DEMUXER_STREAM_IMPL_H_ 6 #define MEDIA_MOJO_CLIENTS_MOJO_DEMUXER_STREAM_IMPL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "media/base/demuxer_stream.h" 10 #include "media/base/demuxer_stream.h"
11 #include "media/mojo/interfaces/demuxer_stream.mojom.h" 11 #include "media/mojo/interfaces/demuxer_stream.mojom.h"
12 #include "mojo/public/cpp/bindings/strong_binding.h" 12 #include "mojo/public/cpp/bindings/binding.h"
13 13
14 namespace media { 14 namespace media {
15 class DemuxerStream; 15 class DemuxerStream;
16 16
17 // This class wraps a media::DemuxerStream and exposes it as a 17 // This class wraps a media::DemuxerStream and exposes it as a
18 // mojom::DemuxerStream for use as a proxy from remote applications. 18 // mojom::DemuxerStream for use as a proxy from remote applications.
19 class MojoDemuxerStreamImpl : public mojom::DemuxerStream { 19 class MojoDemuxerStreamImpl : public mojom::DemuxerStream {
20 public: 20 public:
21 // |stream| is the underlying DemuxerStream we are proxying for. 21 // |stream| is the underlying DemuxerStream we are proxying for.
22 // Note: |this| does not take ownership of |stream|. 22 // Note: |this| does not take ownership of |stream|.
23 MojoDemuxerStreamImpl(media::DemuxerStream* stream, 23 MojoDemuxerStreamImpl(media::DemuxerStream* stream,
24 mojo::InterfaceRequest<mojom::DemuxerStream> request); 24 mojo::InterfaceRequest<mojom::DemuxerStream> request);
25 ~MojoDemuxerStreamImpl() override; 25 ~MojoDemuxerStreamImpl() override;
26 26
27 // mojom::DemuxerStream implementation. 27 // mojom::DemuxerStream implementation.
28 // InitializeCallback and ReadCallback are defined in 28 // InitializeCallback and ReadCallback are defined in
29 // mojom::DemuxerStream. 29 // mojom::DemuxerStream.
30 void Initialize(const InitializeCallback& callback) override; 30 void Initialize(const InitializeCallback& callback) override;
31 void Read(const ReadCallback& callback) override; 31 void Read(const ReadCallback& callback) override;
32 void EnableBitstreamConverter() override; 32 void EnableBitstreamConverter() override;
33 33
34 // Sets an error handler that will be called if a connection error occurs on
35 // the bound message pipe.
36 void set_connection_error_handler(const mojo::Closure& error_handler) {
37 binding_.set_connection_error_handler(error_handler);
38 }
39
34 private: 40 private:
35 void OnBufferReady(const ReadCallback& callback, 41 void OnBufferReady(const ReadCallback& callback,
36 media::DemuxerStream::Status status, 42 media::DemuxerStream::Status status,
37 const scoped_refptr<media::DecoderBuffer>& buffer); 43 const scoped_refptr<media::DecoderBuffer>& buffer);
38 44
39 mojo::StrongBinding<mojom::DemuxerStream> binding_; 45 mojo::Binding<mojom::DemuxerStream> binding_;
Ken Rockot(use gerrit already) 2016/06/19 14:45:22 Some tests now leak a MojoDemxuerStreamImpl: https
alokp 2016/06/20 16:44:48 Memory leak fix here: https://codereview.chromium.
40 46
41 // See constructor. We do not own |stream_|. 47 // See constructor. We do not own |stream_|.
42 media::DemuxerStream* stream_; 48 media::DemuxerStream* stream_;
43 49
44 // DataPipe for serializing the data section of DecoderBuffer into. 50 // DataPipe for serializing the data section of DecoderBuffer into.
45 mojo::ScopedDataPipeProducerHandle stream_pipe_; 51 mojo::ScopedDataPipeProducerHandle stream_pipe_;
46 52
47 base::WeakPtrFactory<MojoDemuxerStreamImpl> weak_factory_; 53 base::WeakPtrFactory<MojoDemuxerStreamImpl> weak_factory_;
48 DISALLOW_COPY_AND_ASSIGN(MojoDemuxerStreamImpl); 54 DISALLOW_COPY_AND_ASSIGN(MojoDemuxerStreamImpl);
49 }; 55 };
50 56
51 } // namespace media 57 } // namespace media
52 58
53 #endif // MEDIA_MOJO_CLIENTS_MOJO_DEMUXER_STREAM_IMPL_H_ 59 #endif // MEDIA_MOJO_CLIENTS_MOJO_DEMUXER_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | media/mojo/clients/mojo_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698