From b448de886da7a88dada3c2a16e929c51c7025b35 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Tue, 13 Mar 2012 14:59:53 -0400 Subject: [PATCH] Bug 735344 - Use a refcounted pointer to Zip so that the delete doesn't crash Fennec. Also remove some spurious logging. r=glandium --- mozglue/android/APKOpen.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mozglue/android/APKOpen.cpp b/mozglue/android/APKOpen.cpp index 1a251a7109fc..e550dac4c354 100644 --- a/mozglue/android/APKOpen.cpp +++ b/mozglue/android/APKOpen.cpp @@ -723,7 +723,6 @@ static int loadSQLiteLibs(const char *apkName) static mozglueresult loadNSSLibs(const char *apkName) { - __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "loadNSSLibs"); chdir(getenv("GRE_HOME")); #ifdef MOZ_OLD_LINKER @@ -733,7 +732,7 @@ loadNSSLibs(const char *apkName) } #endif - Zip *zip = new Zip(apkName); + RefPtr zip = new Zip(apkName); if (!lib_mapping) { lib_mapping = (struct mapping_info *)calloc(MAX_MAPPING_INFO, sizeof(*lib_mapping)); } @@ -772,14 +771,11 @@ loadNSSLibs(const char *apkName) #undef MOZLOAD #endif - delete zip; - #ifdef MOZ_CRASHREPORTER free(file_ids); file_ids = NULL; #endif - __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "loadNSSLibs 2"); if (!nss_handle) { __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't get a handle to libnss3!"); return FAILURE; @@ -795,7 +791,6 @@ loadNSSLibs(const char *apkName) return FAILURE; } - __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "loadNSSLibs 3"); return setup_nss_functions(nss_handle, nspr_handle, plc_handle); }