i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

screen_saver filter: Fix use-after-free on destruction.

Browse Source 
Stop watching nodes before quitting and therefore deleting the looper
that was subscribed.
This commit is contained in:
Michael Lotz
2015-04-23 23:09:40 +02:00
parent 5d05694ad6
commit 5919f6d4af
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
+3 -3
View File
@@ -120,6 +120,9 @@ ScreenSaverFilter::~ScreenSaverFilter()
{ {
be_roster->StopWatching(fController); be_roster->StopWatching(fController);
if (fWatchingFile || fWatchingDirectory)
watch_node(&fNodeRef, B_STOP_WATCHING, fController);
// We must quit our controller without being locked, or else we might // We must quit our controller without being locked, or else we might
// deadlock; when the controller is gone, there is no reason to lock // deadlock; when the controller is gone, there is no reason to lock
// anymore, anyway. // anymore, anyway.
@@ -128,9 +131,6 @@ ScreenSaverFilter::~ScreenSaverFilter()
delete fCornerRunner; delete fCornerRunner;
delete fRunner; delete fRunner;
if (fWatchingFile || fWatchingDirectory)
watch_node(&fNodeRef, B_STOP_WATCHING, fController);
} }