From a4f1efc434d6c5952ba0cfcf94e6c39356ce0f85 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Thu, 29 May 2014 05:27:46 +0200 Subject: OGLPlayer: check before dereference (cherry picked from commit 228c5099962b7b7574326e3c328db4165796e8a8) Conflicts: avmedia/source/opengl/oglplayer.cxx Change-Id: I4bbaf97fe8c5def441ca106c26ad312281ed352f --- avmedia/source/opengl/oglplayer.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'avmedia') 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) -- cgit v1.2.3