--- a/widget/src/xpwidgets/GfxInfoBase.cpp
+++ b/widget/src/xpwidgets/GfxInfoBase.cpp
@@ -907,16 +907,20 @@ GfxInfoBase::RemoveCollector(GfxInfoColl
 {
   InitCollectors();
   for (PRUint32 i = 0; i < sCollectors->Length(); i++) {
     if ((*sCollectors)[i] == collector) {
       sCollectors->RemoveElementAt(i);
       break;
     }
   }
+  if (sCollectors->IsEmpty()) {
+    delete sCollectors;
+    sCollectors = nsnull;
+  }
 }
 
 GfxInfoCollectorBase::GfxInfoCollectorBase()
 {
   GfxInfoBase::AddCollector(this);
 }
 
 GfxInfoCollectorBase::~GfxInfoCollectorBase()

--- a/widget/src/xpwidgets/GfxInfoCollector.h
+++ b/widget/src/xpwidgets/GfxInfoCollector.h
@@ -72,16 +72,22 @@ class InfoObject
       mOk = JS_FALSE;
 
     if (!mOk)
       return;
 
     mOk = JS_DefineProperty(mCx, mObj, name, STRING_TO_JSVAL(string), NULL, NULL, JSPROP_ENUMERATE);
   }
 
+  void DefineProperty(const char *name, const char *value)
+  { 
+    nsAutoString string = NS_ConvertASCIItoUTF16(value);
+    DefineProperty(name, string); 
+  }
+
   private:
   // We need to ensure that this object lives on the stack so that GC sees it properly
   InfoObject(JSContext *aCx) : mCx(aCx), mOk(JS_TRUE)
   {
     mObj = JS_NewObject(mCx, NULL, NULL, NULL);
     if (!mObj)
       mOk = JS_FALSE;
   }