Issue 4613 - fix leak of Thread

src/FileSystemJsObject.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <AdblockPlus/FileSystem.h>
 #include <stdexcept>
 #include <sstream>
 #include <vector>
+#include <thread>

[sergei, 2016/11/21 10:03:59]

Sorry, overlooked, it's not used, so I won't include it into commit.

 
 #include <AdblockPlus/JsValue.h>
 #include "FileSystemJsObject.h"
 #include "JsContext.h"
 #include "Thread.h"
 #include "Utils.h"
 
 using namespace AdblockPlus;
 
 namespace
 {
   class IoThread : public Thread
   {
   public:
     IoThread(JsEnginePtr jsEngine, JsValuePtr callback)
-      : jsEngine(jsEngine), fileSystem(jsEngine->GetFileSystem()),
+      : Thread(true), jsEngine(jsEngine), fileSystem(jsEngine->GetFileSystem()),
         callback(callback)
     {
     }
 
   protected:
     JsEnginePtr jsEngine;
     FileSystemPtr fileSystem;
     JsValuePtr callback;
   };
 
@@ skipping 24 matching lines @@
         error =  "Unknown error while reading from " + path;
       }
 
       const JsContext context(jsEngine);
       JsValuePtr result = jsEngine->NewObject();
       result->SetProperty("content", content);
       result->SetProperty("error", error);
       JsValueList params;
       params.push_back(result);
       callback->Call(params);
-      delete this;
     }
 
   private:
     std::string path;
   };
 
   class WriteThread : public IoThread
   {
   public:
     WriteThread(JsEnginePtr jsEngine, JsValuePtr callback,
@@ skipping 18 matching lines @@
       catch (...)
       {
         error = "Unknown error while writing to " + path;
       }
 
       const JsContext context(jsEngine);
       JsValuePtr errorValue = jsEngine->NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
-      delete this;
     }
 
   private:
     std::string path;
     std::string content;
   };
 
   class MoveThread : public IoThread
   {
   public:
@@ skipping 17 matching lines @@
       catch (...)
       {
         error = "Unknown error while moving " + fromPath + " to " + toPath;
       }
 
       const JsContext context(jsEngine);
       JsValuePtr errorValue = jsEngine->NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
-      delete this;
     }
 
   private:
     std::string fromPath;
     std::string toPath;
   };
 
   class RemoveThread : public IoThread
   {
   public:
@@ skipping 17 matching lines @@
       catch (...)
       {
         error = "Unknown error while removing " + path;
       }
 
       const JsContext context(jsEngine);
       JsValuePtr errorValue = jsEngine->NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
-      delete this;
     }
 
   private:
     std::string path;
   };
 
 
   class StatThread : public IoThread
   {
   public:
@@ skipping 24 matching lines @@
       JsValuePtr result = jsEngine->NewObject();
       result->SetProperty("exists", statResult.exists);
       result->SetProperty("isFile", statResult.isFile);
       result->SetProperty("isDirectory", statResult.isDirectory);
       result->SetProperty("lastModified", statResult.lastModified);
       result->SetProperty("error", error);
 
       JsValueList params;
       params.push_back(result);
       callback->Call(params);
-      delete this;
     }
 
   private:
     std::string path;
   };
 
   v8::Handle<v8::Value> ReadCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
@@ skipping 104 matching lines @@
 JsValuePtr FileSystemJsObject::Setup(JsEnginePtr jsEngine, JsValuePtr obj)
 {
   obj->SetProperty("read", jsEngine->NewCallback(::ReadCallback));
   obj->SetProperty("write", jsEngine->NewCallback(::WriteCallback));
   obj->SetProperty("move", jsEngine->NewCallback(::MoveCallback));
   obj->SetProperty("remove", jsEngine->NewCallback(::RemoveCallback));
   obj->SetProperty("stat", jsEngine->NewCallback(::StatCallback));
   obj->SetProperty("resolve", jsEngine->NewCallback(::ResolveCallback));
   return obj;
 }