diff options
| author | jhurst <jhurst@cinecert.com> | 2021-09-18 15:35:18 -0700 |
|---|---|---|
| committer | jhurst <jhurst@cinecert.com> | 2021-09-18 15:35:18 -0700 |
| commit | 0ade07e187bd9f632a13f1ddd3ccd3d3938326e5 (patch) | |
| tree | dab20e5722b4d529aa7a936bdf6f69976efd5278 /src/AS_02_IAB.cpp | |
| parent | 29af7be260f9d77d121ca2032f9dfcee40dbdb3a (diff) | |
fixed egregious pointer misuse previously committed by me
Diffstat (limited to 'src/AS_02_IAB.cpp')
| -rw-r--r-- | src/AS_02_IAB.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/AS_02_IAB.cpp b/src/AS_02_IAB.cpp index 4bf8275..5d1876b 100644 --- a/src/AS_02_IAB.cpp +++ b/src/AS_02_IAB.cpp @@ -80,7 +80,7 @@ static const int CLIP_BER_LENGTH_SIZE = 8; static const int RESERVED_KL_SIZE = ASDCP::SMPTE_UL_LENGTH + CLIP_BER_LENGTH_SIZE; -AS_02::IAB::MXFWriter::MXFWriter() : m_ClipStart(0) { +AS_02::IAB::MXFWriter::MXFWriter() : m_ClipStart(0), m_Writer(0) { } AS_02::IAB::MXFWriter::~MXFWriter() {} @@ -114,7 +114,7 @@ AS_02::IAB::MXFWriter::OpenWrite( /* are we already running */ - if (this->m_Writer->m_State != ST_BEGIN) { + if ( this->m_Writer && this->m_Writer->m_State != ST_BEGIN ) { KM_RESULT_STATE_HERE(); return Kumu::RESULT_STATE; } @@ -370,15 +370,15 @@ AS_02::IAB::MXFWriter::Finalize() { void AS_02::IAB::MXFWriter::Reset() { - this->m_Writer.set(NULL); - this->m_Writer->m_State = ST_BEGIN; + this->m_Writer.set(0); } //------------------------------------------------------------------------------------------ -AS_02::IAB::MXFReader::MXFReader(const Kumu::IFileReaderFactory& fileReaderFactory) : m_FileReaderFactory(fileReaderFactory) {} +AS_02::IAB::MXFReader::MXFReader(const Kumu::IFileReaderFactory& fileReaderFactory) : + m_FileReaderFactory(fileReaderFactory), m_Reader(0) {} AS_02::IAB::MXFReader::~MXFReader() { if ( m_Reader && m_Reader->m_File->IsOpen()) { @@ -409,7 +409,7 @@ AS_02::IAB::MXFReader::OpenRead(const std::string& filename) { /* are we already running */ - if (this->m_Reader->m_State != ST_READER_BEGIN) { + if ( this->m_Reader && this->m_Reader->m_State != ST_READER_BEGIN ) { KM_RESULT_STATE_HERE(); return Kumu::RESULT_STATE; } @@ -695,8 +695,7 @@ AS_02::IAB::MXFReader::Reset() { m_Reader->Close(); } - this->m_Reader.set(NULL); - this->m_Reader->m_State = ST_READER_BEGIN; + this->m_Reader.set(0); } // |