diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp index 4ae821b0459bb..6966c6c87232a 100644 --- 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 index 7e2f305658f8e..d045efed59925 100644 --- 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 index b1f14c84334d5..4a2d35823eea4 100644 --- a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp +++ b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp @@ -136,6 +136,8 @@ bool CEGLNativeTypeRaspberryPI::CreateNativeWindow() bool CEGLNativeTypeRaspberryPI::GetNativeDisplay(XBNativeDisplayType **nativeDisplay) const { + if (!nativeDisplay) + return false; *nativeDisplay = (XBNativeDisplayType*) &m_nativeDisplay; return true; } @@ -143,6 +145,8 @@ bool CEGLNativeTypeRaspberryPI::GetNativeDisplay(XBNativeDisplayType **nativeDis bool CEGLNativeTypeRaspberryPI::GetNativeWindow(XBNativeDisplayType **nativeWindow) const { DLOG("CEGLNativeTypeRaspberryPI::GetNativeWindow\n"); + if (!nativeWindow) + return false; *nativeWindow = (XBNativeWindowType*) &m_nativeWindow; return true; }