From 54b0acb432b3cd4a20403862e2ed3ef33ae85c0f Mon Sep 17 00:00:00 2001
From: erikchen <erikchen@chromium.org>
Date: Wed, 26 Oct 2016 11:10:24 -0700
Subject: [PATCH] Change destruction order to fix potential invalid pointer
 dereference.

BUG=657226

Review-Url: https://codereview.webrtc.org/2450953002
Cr-Commit-Position: refs/heads/master@{#14792}
---
 webrtc/modules/desktop_capture/screen_capturer_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac.mm b/webrtc/modules/desktop_capture/screen_capturer_mac.mm
index 47885ee9d9..3251e5a065 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_mac.mm
+++ b/webrtc/modules/desktop_capture/screen_capturer_mac.mm
@@ -390,8 +390,8 @@ ScreenCapturerMac::ScreenCapturerMac(
 
 ScreenCapturerMac::~ScreenCapturerMac() {
   ReleaseBuffers();
-  display_stream_manager_->PrepareForSelfDestruction();
   UnregisterRefreshAndMoveHandlers();
+  display_stream_manager_->PrepareForSelfDestruction();
   dlclose(app_services_library_);
   dlclose(opengl_library_);
 }