egl: guard against null-pointer deref

theuni · Oct 17, 2012 · b6d2be7 · b6d2be7
1 parent 6cb41b9
commit b6d2be7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp
@@ -80,12 +80,16 @@ bool CEGLNativeTypeAmlogic::CreateNativeWindow()
 
 bool CEGLNativeTypeAmlogic::GetNativeDisplay(EGLNativeDisplayType **nativeDisplay) const
 {
+  if (!nativeDisplay)
+    return false;
   *nativeDisplay = (XBNativeDisplayType*) &m_nativeDisplay;
   return true;
 }
 
 bool CEGLNativeTypeAmlogic::GetNativeWindow(XBNativeWindowType **nativeWindow) const
 {
+  if (!nativeWindow)
+    return false;
   *nativeWindow = (XBNativeWindowType*) &m_nativeWindow;
   return true;
 }

diff --git a/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp b/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp
@@ -68,12 +68,16 @@ bool CEGLNativeTypeAndroid::CreateNativeWindow()
 
 bool CEGLNativeTypeAndroid::GetNativeDisplay(XBNativeDisplayType **nativeDisplay) const
 {
+  if (!nativeDisplay)
+    return false;
   *nativeDisplay = (XBNativeDisplayType*) &m_nativeDisplay;
   return true;
 }
 
 bool CEGLNativeTypeAndroid::GetNativeWindow(XBNativeWindowType **nativeWindow) const
 {
+  if (!nativeWindow)
+    return false;
   *nativeWindow = (XBNativeWindowType*) &m_nativeWindow;
   return true;
 }

diff --git a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp
@@ -136,13 +136,17 @@ bool CEGLNativeTypeRaspberryPI::CreateNativeWindow()
 
 bool CEGLNativeTypeRaspberryPI::GetNativeDisplay(XBNativeDisplayType **nativeDisplay) const
 {
+  if (!nativeDisplay)
+    return false;
   *nativeDisplay = (XBNativeDisplayType*) &m_nativeDisplay;
   return true;
 }
 
 bool CEGLNativeTypeRaspberryPI::GetNativeWindow(XBNativeDisplayType **nativeWindow) const
 {
   DLOG("CEGLNativeTypeRaspberryPI::GetNativeWindow\n");
+  if (!nativeWindow)
+    return false;
   *nativeWindow = (XBNativeWindowType*) &m_nativeWindow;
   return true;
 }