commit 8d5b18ee1c70e3f3255be6b8d1445e40e74a775a
author erikchen <erikchen@chromium.org> Wed Oct 26 18:10:24 2016
committer Commit bot <commit-bot@chromium.org> Wed Oct 26 18:10:29 2016
tree a44d233e2c1c7c5d22433eb2f27e2ef6d8cb36e9
parent 88f6fda27a4c19ca34efe4de70ef0b6e8c68d883

Change destruction order to fix potential invalid pointer dereference.

BUG=657226

Review-Url: https://codereview.webrtc.org/2450953002
Cr-Original-Commit-Position: refs/heads/master@{#14792}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 54b0acb432b3cd4a20403862e2ed3ef33ae85c0f

modules/desktop_capture/screen_capturer_mac.mm

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