Bug 1056941 - Fix dangerous destructors in Fennec code; r=blassey

2014-08-26 15:07:59 -04:00
parent 2fe5eb0c13
commit ba12eedda5
22 changed files with 72 additions and 19 deletions
--- a/widget/android/nsAndroidProtocolHandler.cpp
+++ b/widget/android/nsAndroidProtocolHandler.cpp
@@ -25,11 +25,15 @@ public:
        mBridgeInputStream = env->NewGlobalRef(GeckoAppShell::CreateInputStream(connection));
        mBridgeChannel = env->NewGlobalRef(AndroidBridge::ChannelCreate(mBridgeInputStream));
    }
+
+private:
    virtual ~AndroidInputStream() {
        JNIEnv *env = GetJNIForThread();
        env->DeleteGlobalRef(mBridgeInputStream);
        env->DeleteGlobalRef(mBridgeChannel);
    }
+
+public:
    NS_DECL_THREADSAFE_ISUPPORTS
    NS_DECL_NSIINPUTSTREAM