diff --git a/mozglue/android/NSSBridge.cpp b/mozglue/android/NSSBridge.cpp index 5c014045532..5a19e6cf9de 100644 --- a/mozglue/android/NSSBridge.cpp +++ b/mozglue/android/NSSBridge.cpp @@ -13,13 +13,6 @@ #include "ElfLoader.h" -#ifdef MOZ_MEMORY -// libc's free(). -extern "C" void __real_free(void *); -#else -#define __real_free(a) free(a) -#endif - #ifdef DEBUG #define LOG(x...) __android_log_print(ANDROID_LOG_INFO, "GeckoJNI", x) #else @@ -91,8 +84,7 @@ throwError(JNIEnv* jenv, const char * funcString) { LOG("Throwing error: %s\n", msg); JNI_Throw(jenv, "java/lang/Exception", msg); - // msg is allocated by asprintf, it needs to be freed by libc. - __real_free(msg); + free(msg); LOG("Error thrown\n"); } diff --git a/mozglue/android/SQLiteBridge.cpp b/mozglue/android/SQLiteBridge.cpp index d11a87f886b..2d444749d0d 100644 --- a/mozglue/android/SQLiteBridge.cpp +++ b/mozglue/android/SQLiteBridge.cpp @@ -11,13 +11,6 @@ #include "ElfLoader.h" #include "SQLiteBridge.h" -#ifdef MOZ_MEMORY -// libc's free(). -extern "C" void __real_free(void *); -#else -#define __real_free(a) free(a) -#endif - #ifdef DEBUG #define LOG(x...) __android_log_print(ANDROID_LOG_INFO, "GeckoJNI", x) #else @@ -85,8 +78,7 @@ static void throwSqliteException(JNIEnv* jenv, const char* aFormat, ...) vasprintf(&msg, aFormat, ap); LOG("Error in SQLiteBridge: %s\n", msg); JNI_Throw(jenv, "org/mozilla/gecko/sqlite/SQLiteBridgeException", msg); - // msg is allocated by vasprintf, it needs to be freed by libc. - __real_free(msg); + free(msg); va_end(ap); }