Merge branch 'fixes' into 'master'

Fix crash on non-hybris devices. Fixes MER#2031 See merge request mer-core/lipstick!110
sailfishos · Mar 29, 2019 · 9836b26 · 9836b26
2 parents da781e1 + 281ca0f
commit 9836b26
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/compositor/eglhybrisfunctions.cpp b/src/compositor/eglhybrisfunctions.cpp
@@ -17,9 +17,17 @@
 
 #include <QGlobalStatic>
 
+static const char* checked_strstr(const char *haystack, const char *needle)
+{
+    if (!haystack || !needle) {
+        return 0;
+    }
+    return strstr(haystack, needle);
+}
+
 struct SupportedEglHybrisFunctions : public EglHybrisFunctions
 {
-    const bool supported = strstr(eglQueryString(eglGetDisplay(EGL_DEFAULT_DISPLAY), EGL_EXTENSIONS), "EGL_HYBRIS_native_buffer2") != 0
+    const bool supported = checked_strstr(eglQueryString(eglGetDisplay(EGL_DEFAULT_DISPLAY), EGL_EXTENSIONS), "EGL_HYBRIS_native_buffer2") != 0
             && glEGLImageTargetTexture2DOES
             && eglCreateImageKHR
             && eglDestroyImageKHR