Issue 5118 - Lock the platform interfaces before use

src/Platform.cpp

 /*
 * This file is part of Adblock Plus <https://adblockplus.org/>,
 * Copyright (C) 2006-present eyeo GmbH
 *
 * Adblock Plus is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 3 as
 * published by the Free Software Foundation.
 *
 * Adblock Plus is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 34 matching lines @@
 Platform::Platform(CreationParameters&& creationParameters)
 {
   ASSIGN_PLATFORM_PARAM(logSystem);
   ASSIGN_PLATFORM_PARAM(timer);
   ASSIGN_PLATFORM_PARAM(fileSystem);
   ASSIGN_PLATFORM_PARAM(webRequest);
 }
 
 Platform::~Platform()
 {
+  std::lock_guard<std::recursive_mutex> lock(interfacesMutex);
+  logSystem.reset();
+  timer.reset();
+  fileSystem.reset();
+  webRequest.reset();
 }
 
 void Platform::SetUpJsEngine(const AppInfo& appInfo, std::unique_ptr<IV8IsolateProvider> isolate)
 {
   std::lock_guard<std::mutex> lock(modulesMutex);
   if (jsEngine)
     return;
   jsEngine = JsEngine::New(appInfo, *this, std::move(isolate));
 }
 
@@ skipping 23 matching lines @@
       onCreated(*filterEngine);
   }, parameters);
 }
 
 FilterEngine& Platform::GetFilterEngine()
 {
   CreateFilterEngineAsync();
   return *std::shared_future<FilterEnginePtr>(filterEngine).get();
 }
 
-ITimer& Platform::GetTimer()
+void Platform::WithTimer(const WithTimerCallback& callback)
 {
-  return *timer;
+  std::lock_guard<std::recursive_mutex> lock(interfacesMutex);
+  if (timer && callback)
+    callback(*timer);
 }
 
-IFileSystem& Platform::GetFileSystem()
+void Platform::WithFileSystem(const WithFileSystemCallback& callback)
 {
-  return *fileSystem;
+  std::lock_guard<std::recursive_mutex> lock(interfacesMutex);
+  if (fileSystem && callback)
+    callback(*fileSystem);
 }
 
-IWebRequest& Platform::GetWebRequest()
+void Platform::WithWebRequest(const WithWebRequestCallback& callback)
 {
-  return *webRequest;
+  std::lock_guard<std::recursive_mutex> lock(interfacesMutex);
+  if (webRequest && callback)
+    callback(*webRequest);
 }
 
 LogSystem& Platform::GetLogSystem()
 {
   return *logSystem;
 }
 
 namespace
 {
   class DefaultPlatform : public Platform
@@ skipping 59 matching lines @@
   if (!timer)
     CreateDefaultTimer();
   if (!fileSystem)
     CreateDefaultFileSystem();
   if (!webRequest)
     CreateDefaultWebRequest();
 
   std::unique_ptr<Platform> platform(new DefaultPlatform(asyncExecutor, std::move(*this)));
   asyncExecutor.reset();
   return platform;
-}
+}