corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 763166 - Fix race condition that could result in using an uninitialized AndroidBridge. r=snorp

Browse Source
This commit is contained in:
Kartikaya Gupta
2012-07-31 17:34:06 -04:00
parent d53a516fed
commit ec065c8262
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
widget/android/AndroidBridge.cpp
View File

@@ -59,7 +59,7 @@ class AndroidRefable {
// This isn't in AndroidBridge.h because including StrongPointer.h there is gross
static android::sp<AndroidRefable> (*android_SurfaceTexture_getNativeWindow)(JNIEnv* env, jobject surfaceTexture) = nullptr;
AndroidBridge *
void
AndroidBridge::ConstructBridge(JNIEnv *jEnv,
jclass jGeckoAppShellClass)
{
@@ -73,12 +73,11 @@ AndroidBridge::ConstructBridge(JNIEnv *jEnv,
PR_NewThreadPrivateIndex(&sJavaEnvThreadIndex, JavaThreadDetachFunc);
sBridge = new AndroidBridge();
if (!sBridge->Init(jEnv, jGeckoAppShellClass)) {
delete sBridge;
sBridge = 0;
AndroidBridge *bridge = new AndroidBridge();
if (!bridge->Init(jEnv, jGeckoAppShellClass)) {
delete bridge;
}
return sBridge;
sBridge = bridge;
}
bool