diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-29 05:27:46 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-11 19:27:32 +0200 |
| commit | a4f1efc434d6c5952ba0cfcf94e6c39356ce0f85 (patch) | |
| tree | 5f6bd8bb46c04d0885d41703fa73ed9d28a579b3 /avmedia | |
| parent | 8dcc15538ec0a60b181ff8ecf386abe678eee03c (diff) | |
OGLPlayer: check before dereference
(cherry picked from commit 228c5099962b7b7574326e3c328db4165796e8a8)
Conflicts:
avmedia/source/opengl/oglplayer.cxx
Change-Id: I4bbaf97fe8c5def441ca106c26ad312281ed352f
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 3a69a8401f94..3bb4a160074f 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -31,14 +31,17 @@ OGLPlayer::OGLPlayer() OGLPlayer::~OGLPlayer() { osl::MutexGuard aGuard(m_aMutex); - for (size_t i = 0; i < m_pHandle->size; ++i) + if( m_pHandle ) { - if (m_pHandle->files[i].type != GLTF_JSON) + for (size_t i = 0; i < m_pHandle->size; ++i) { - delete [] m_pHandle->files[i].buffer; + if (m_pHandle->files[i].type != GLTF_JSON) + { + delete [] m_pHandle->files[i].buffer; + } } + gltf_renderer_release(m_pHandle); } - gltf_renderer_release(m_pHandle); } static bool lcl_LoadFile( glTFFile* io_pFile, const OUString& rURL) |