Bug 597715 - xpcshell test test_service_sync_checkServerError.js crash [@ mozilla::scache::StartupCache::WriteToDisk()] r=dwitte a=blocking2.0

startupcache/StartupCache.cpp

@@ -104,6 +104,7 @@ StartupCache::InitSingleton()
   rv = StartupCache::gStartupCache->Init();
   if (NS_FAILED(rv)) {
     delete StartupCache::gStartupCache;
+    StartupCache::gStartupCache = nsnull;
   }
   return rv;
 }
@@ -116,6 +117,10 @@ StartupCache::StartupCache()
 
 StartupCache::~StartupCache() 
 {
+  if (mTimer) {
+    mTimer->Cancel();
+  }
+
   // Generally, the in-memory table should be empty here,
   // but in special cases (like Talos Ts tests) we
   // could shut down before we write.