Fixup for Bug 683127 part 11 to avoid crashing on places migration. rs=Ms2ger
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 21 Jan 2012 20:25:09 +0100
changeset 86274 8297a76e055272e728e6a5ceda034466ccfc26cc
parent 86273 d43360499b86d66d82ed0e585b75bb3237864ad2
child 86275 244711942710bc1ddf8792c33d10f5a63b5e1267
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
bugs683127
milestone12.0a1
Fixup for Bug 683127 part 11 to avoid crashing on places migration. rs=Ms2ger
mozglue/android/APKOpen.cpp
--- a/mozglue/android/APKOpen.cpp
+++ b/mozglue/android/APKOpen.cpp
@@ -754,17 +754,17 @@ static void loadSQLiteLibs(const char *a
 
 #ifdef MOZ_CRASHREPORTER
   file_ids = (char *)extractBuf("lib.id", zip);
 #endif
 
 #ifndef MOZ_OLD_LINKER
   char *file = new char[strlen(apkName) + sizeof("!/mozsqlite3.so")];
   sprintf(file, "%s!/mozsqlite3.so", apkName);
-  __wrap_dlopen(file, RTLD_GLOBAL | RTLD_LAZY);
+  sqlite_handle = __wrap_dlopen(file, RTLD_GLOBAL | RTLD_LAZY);
   delete [] file;
 #else
 #define MOZLOAD(name) mozload("lib" name ".so", zip)
   sqlite_handle = MOZLOAD("mozsqlite3");
 #undef MOZLOAD
 #endif
 
   delete zip;