Ozone null pointer checks.

Check for null pointers so DisplayOzone::terminate() doesn't crash when DisplayOzone::initialize() wasn't completely successful. BUG=angleproject:1419 Change-Id: I70e994490a7282083d5289e6c35b077676688b65 Reviewed-on: https://chromium-review.googlesource.com/354700Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>

Ozone null pointer checks.
35f7ef81 · Frank Henigman · Commit Bot · e064d44b · 35f7ef81
Commit 35f7ef81 authored Jun 21, 2016 by Frank Henigman Committed by Commit Bot Jun 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

DisplayOzone.cpp src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp +12 -5

No files found.
--- a/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
+++ b/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
@@ -811,14 +811,21 @@ void DisplayOzone::terminate()
    SafeDelete(mFunctionsGL);
-    mEGL->terminate();
+    if (mEGL)
-    SafeDelete(mEGL);
+    {
+        mEGL->terminate();
+        SafeDelete(mEGL);
+    }
    drmModeFreeCrtc(mCRTC);
-    int fd = gbm_device_get_fd(mGBM);
+    if (mGBM)
-    gbm_device_destroy(mGBM);
+    {
-    close(fd);
+        int fd = gbm_device_get_fd(mGBM);
+        gbm_device_destroy(mGBM);
+        mGBM = nullptr;
+        close(fd);
+    }
 }
 SurfaceImpl *DisplayOzone::createWindowSurface(const egl::SurfaceState &state,