| Index: media/base/data_buffer.cc
|
| diff --git a/media/base/data_buffer.cc b/media/base/data_buffer.cc
|
| index b082a18a14bc6ad4f85aba1364c03bb8cbfc3a0c..39f2798edfbace78a7a6e9dcc2f2df1ced8032c5 100644
|
| --- a/media/base/data_buffer.cc
|
| +++ b/media/base/data_buffer.cc
|
| @@ -30,6 +30,18 @@ DataBuffer::DataBuffer(int buffer_size)
|
| data_.reset(NULL);
|
| }
|
|
|
| +DataBuffer::DataBuffer(int buffer_size, bool is_keyframe)
|
| + : Buffer(base::TimeDelta(), base::TimeDelta(), is_keyframe),
|
| + data_(new uint8[buffer_size]),
|
| + buffer_size_(buffer_size),
|
| + data_size_(0) {
|
| + CHECK(data_.get()) << "DataBuffer ctor failed to allocate memory";
|
| +
|
| + // Prevent arbitrary pointers.
|
| + if (buffer_size == 0)
|
| + data_.reset(NULL);
|
| +}
|
| +
|
| DataBuffer::~DataBuffer() {}
|
|
|
| scoped_refptr<DataBuffer> DataBuffer::CopyFrom(const uint8* data,
|
|
|