diff --git a/mozilla/modules/libpref/src/prefapi.c b/mozilla/modules/libpref/src/prefapi.c
index aa0b4456870..c6c8d50c25a 100644
--- a/mozilla/modules/libpref/src/prefapi.c
+++ b/mozilla/modules/libpref/src/prefapi.c
@@ -510,23 +510,7 @@ PR_IMPLEMENT(void) PREF_Cleanup()
 	}
 	gCallbacks = NULL;
 
-	if (gMochaContext)
-		JS_DestroyContext(gMochaContext);
-	gMochaContext = NULL;
-
-	if (gMochaTaskState)
-		JS_Finish(gMochaTaskState);                      
-	gMochaTaskState = NULL;
-	
-	if (gHashTable)
-		PR_HashTableDestroy(gHashTable);
-	gHashTable = NULL;
-
-#ifdef PREF_SUPPORT_OLD_PATH_STRINGS
-	if (gFileName)
-		PL_strfree(gFileName);
-	gFileName = NULL;
-#endif
+    PREF_CleanupPrefs();
 }
 
 /* Frees up all the objects except the callback list. */
@@ -544,6 +528,8 @@ PR_IMPLEMENT(void) PREF_CleanupPrefs()
 		PR_HashTableDestroy(gHashTable);
 	gHashTable = NULL;
 
+    free(gSavedLine);
+
 #ifdef PREF_SUPPORT_OLD_PATH_STRINGS
 	if (gFileName)
 		PL_strfree(gFileName);
diff --git a/mozilla/modules/libpref/src/prefapi.cpp b/mozilla/modules/libpref/src/prefapi.cpp
index aa0b4456870..c6c8d50c25a 100644
--- a/mozilla/modules/libpref/src/prefapi.cpp
+++ b/mozilla/modules/libpref/src/prefapi.cpp
@@ -510,23 +510,7 @@ PR_IMPLEMENT(void) PREF_Cleanup()
 	}
 	gCallbacks = NULL;
 
-	if (gMochaContext)
-		JS_DestroyContext(gMochaContext);
-	gMochaContext = NULL;
-
-	if (gMochaTaskState)
-		JS_Finish(gMochaTaskState);                      
-	gMochaTaskState = NULL;
-	
-	if (gHashTable)
-		PR_HashTableDestroy(gHashTable);
-	gHashTable = NULL;
-
-#ifdef PREF_SUPPORT_OLD_PATH_STRINGS
-	if (gFileName)
-		PL_strfree(gFileName);
-	gFileName = NULL;
-#endif
+    PREF_CleanupPrefs();
 }
 
 /* Frees up all the objects except the callback list. */
@@ -544,6 +528,8 @@ PR_IMPLEMENT(void) PREF_CleanupPrefs()
 		PR_HashTableDestroy(gHashTable);
 	gHashTable = NULL;
 
+    free(gSavedLine);
+
 #ifdef PREF_SUPPORT_OLD_PATH_STRINGS
 	if (gFileName)
 		PL_strfree(gFileName);