aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2016-01-09 15:49:47 -0800
committerMartijn Kaijser <martijn@xbmc.org>2016-01-09 15:49:47 -0800
commit68a37d2da1873b67e37924a74912ab3850fe334f (patch)
tree4a868e199da359471ee90db1e3a4a7023ee62cfd
parent6b061c66d505a73c206bb2305ed8e4829cb451b2 (diff)
parent311f032aadd104029fcb687b0416fad5cc14272d (diff)
Merge pull request #8809 from ace20022/del_Jarvis
[TextureManager] Fix possible invalid pointer deletion.
-rw-r--r--xbmc/guilib/TextureManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/guilib/TextureManager.cpp b/xbmc/guilib/TextureManager.cpp
index d172d88481..ce74975610 100644
--- a/xbmc/guilib/TextureManager.cpp
+++ b/xbmc/guilib/TextureManager.cpp
@@ -341,9 +341,9 @@ const CTextureArray& CGUITextureManager::Load(const std::string& strTextureName,
if (bundle >= 0)
{
- CBaseTexture **pTextures;
+ CBaseTexture **pTextures = nullptr;
int nLoops = 0, width = 0, height = 0;
- int* Delay;
+ int* Delay = nullptr;
int nImages = m_TexBundle[bundle].LoadAnim(strTextureName, &pTextures, width, height, nLoops, &Delay);
if (!nImages)
{