Merge pull request #16178 from ksooo/fix-dangling-addon-callbcks-crash

[interfaces] Fix crash on Kodi exit caused by double freed AsyncCallbackMessage
xbmc · May 26, 2019 · d69497c · d69497c
2 parents 679ed55 + 542fa2c
commit d69497c
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/xbmc/interfaces/legacy/CallbackHandler.cpp b/xbmc/interfaces/legacy/CallbackHandler.cpp
@@ -49,16 +49,13 @@ namespace XBMCAddon
     CallbackQueue::iterator iter = g_callQueue.begin();
     while (iter != g_callQueue.end())
     {
-      AddonClass::Ref<AsyncCallbackMessage> cur(*iter);
+      if ((*iter)->handler.get() == this) // then this message is because of me
       {
-        if (cur->handler.get() == this) // then this message is because of me
-        {
-          g_callQueue.erase(iter);
-          iter = g_callQueue.begin();
-        }
-        else
-          ++iter;
+        g_callQueue.erase(iter);
+        iter = g_callQueue.begin();
       }
+      else
+        ++iter;
     }
   }