Merge pull request #2632 from ace20022/fix_null_pointer

[Fix] Possible NULL pointer dereference in DVDFactoryDemuxer.
xbmc · Apr 20, 2013 · 83b16d0 · 83b16d0
2 parents cb345a7 + f8d1ad1
commit 83b16d0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp
@@ -40,6 +40,9 @@ using namespace PVR;
 
 CDVDDemux* CDVDFactoryDemuxer::CreateDemuxer(CDVDInputStream* pInputStream)
 {
+  if (!pInputStream)
+    return NULL;
+
   // Try to open the AirTunes demuxer
   if (pInputStream->IsStreamType(DVDSTREAM_TYPE_FILE) && pInputStream->GetContent().compare("audio/x-xbmc-pcm") == 0 )
   {