Convert references to FileSystem & Co. into shared pointers (avoid use after free)

include/AdblockPlus/JsEngine.h

Index: include/AdblockPlus/JsEngine.h
===================================================================
--- a/include/AdblockPlus/JsEngine.h
+++ b/include/AdblockPlus/JsEngine.h
@@ -1,39 +1,39 @@
 #ifndef ADBLOCKPLUS_JS_ENGINE_H
 #define ADBLOCKPLUS_JS_ENGINE_H
 
 #include <stdexcept>
 #include <string>
 #include <v8.h>
+#include <AdblockPlus/AppInfo.h>
+#include <AdblockPlus/ErrorCallback.h>
+#include <AdblockPlus/FileSystem.h>
 #include <AdblockPlus/JsValue.h>
+#include <AdblockPlus/WebRequest.h>
+
+#include "tr1_memory.h"
 
 namespace AdblockPlus
 {
-  struct AppInfo;
-  class FileSystem;
-  class WebRequest;
-  class ErrorCallback;
-
   class JsError : public std::runtime_error
   {
   public:
     explicit JsError(const v8::Handle<v8::Value> exception,
         const v8::Handle<v8::Message> message);
   };
 
+  typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr;
+
   class JsEngine
   {
     friend class JsValue;
 
   public:
-    JsEngine(const AppInfo& appInfo,
-             FileSystem* const fileReader,
-             WebRequest* const webRequest,
-             ErrorCallback* const errorCallback);
+    JsEngine(const AppInfo& appInfo = AppInfo());
     JsValuePtr Evaluate(const std::string& source,
         const std::string& filename = "");
     void Load(const std::string& scriptPath);
     void Gc();
     JsValuePtr NewValue(const std::string& val);
     JsValuePtr NewValue(int64_t val);
     JsValuePtr NewValue(bool val);
     inline JsValuePtr NewValue(const char* val)
@@ -44,43 +44,37 @@ namespace AdblockPlus
     {
       return NewValue(static_cast<int64_t>(val));
     }
     JsValuePtr NewObject();
     JsValuePtr NewCallback(v8::InvocationCallback callback);
     static JsEngine& FromArguments(const v8::Arguments& arguments);
     JsValueList ConvertArguments(const v8::Arguments& arguments);
 
-    inline FileSystem& GetFileSystem()
-    {
-      return fileSystem;
-    }
-    inline WebRequest& GetWebRequest()
-    {
-      return webRequest;
-    }
-    inline ErrorCallback& GetErrorCallback()
-    {
-      return errorCallback;
-    }
+    FileSystemPtr GetFileSystem();
+    void SetFileSystem(FileSystemPtr val);
+    WebRequestPtr GetWebRequest();
+    void SetWebRequest(WebRequestPtr val);
+    ErrorCallbackPtr GetErrorCallback();
+    void SetErrorCallback(ErrorCallbackPtr val);
 
     class Context
     {
     public:
       Context(const JsEngine& jsEngine);
       virtual inline ~Context() {};
 
     private:
       const v8::Locker locker;
       const v8::HandleScope handleScope;
       const v8::Context::Scope contextScope;
     };
 
   private:
-    FileSystem& fileSystem;
-    WebRequest& webRequest;
-    ErrorCallback& errorCallback;
+    FileSystemPtr fileSystem;
+    WebRequestPtr webRequest;
+    ErrorCallbackPtr errorCallback;
     v8::Isolate* isolate;
     v8::Persistent<v8::Context> context;
   };
 }
 
 #endif