Index: mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp,v
retrieving revision 1.52
diff -pU40 -r1.52 mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
--- mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
+++ mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
@@ -288,103 +288,110 @@ InstallTriggerGlobalInstall(JSContext *c
     JS_ReportError(cx, "Could not get the Subject Principal during InstallTrigger.Install()");
     return JS_FALSE;
   }
 
   // get window.location to construct relative URLs
   nsCOMPtr<nsIURI> baseURL;
   JSObject* global = JS_GetGlobalObject(cx);
   if (global)
   {
     jsval v;
     if (JS_GetProperty(cx,global,"location",&v))
     {
       nsAutoString location;
       ConvertJSValToStr( location, cx, v );
       NS_NewURI(getter_AddRefs(baseURL), location);
     }
   }
 
   PRBool abortLoad = PR_FALSE;
 
   // parse associative array of installs
   if ( argc >= 1 && JSVAL_IS_OBJECT(argv[0]) && JSVAL_TO_OBJECT(argv[0]) )
   {
     nsXPITriggerInfo *trigger = new nsXPITriggerInfo();
     if (!trigger)
       return JS_FALSE;
 
     trigger->SetPrincipal(principal);
 
     JSIdArray *ida = JS_Enumerate( cx, JSVAL_TO_OBJECT(argv[0]) );
     if ( ida )
     {
       jsval v;
       const PRUnichar *name, *URL;
       const PRUnichar *iconURL = nsnull;
       const char *hash;
 
       for (int i = 0; i < ida->length && !abortLoad; i++ )
       {
         JS_IdToValue( cx, ida->vector[i], &v );
-        name = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( JS_ValueToString( cx, v ) ));
+        JSString * str = JS_ValueToString( cx, v );
+        if (!str)
+        {
+          abortLoad = PR_TRUE;
+          break;
+        }
+
+        name = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( str ));
 
         URL = iconURL = nsnull;
         hash = nsnull;
         JS_GetUCProperty( cx, JSVAL_TO_OBJECT(argv[0]), NS_REINTERPRET_CAST(const jschar*, name), nsCRT::strlen(name), &v );
         if ( JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v) ) 
         {
           jsval v2;
           if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "URL", &v2 ) && !JSVAL_IS_VOID(v2))
             URL = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( JS_ValueToString( cx, v2 ) ));
 
           if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "IconURL", &v2 ) && !JSVAL_IS_VOID(v2))
             iconURL = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( JS_ValueToString( cx, v2 ) ));
 
           if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "Hash", &v2) && !JSVAL_IS_VOID(v2))
             hash = NS_REINTERPRET_CAST(const char*, JS_GetStringBytes( JS_ValueToString( cx, v2 ) ));
         }
         else
         {
           URL = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( JS_ValueToString( cx, v ) ));
         }
 
-        if ( name && URL )
+        if ( URL )
         {
             // Get relative URL to load
             nsAutoString xpiURL(URL);
             if (baseURL)
             {
                 nsCAutoString resolvedURL;
                 baseURL->Resolve(NS_ConvertUTF16toUTF8(xpiURL), resolvedURL);
                 xpiURL = NS_ConvertUTF8toUTF16(resolvedURL);
             }
 
             nsAutoString icon(iconURL);
             if (iconURL && baseURL)
             {
                 nsCAutoString resolvedIcon;
                 baseURL->Resolve(NS_ConvertUTF16toUTF8(icon), resolvedIcon);
                 icon = NS_ConvertUTF8toUTF16(resolvedIcon);
             }
 
             // Make sure we're allowed to load this URL and the icon URL
             nsresult rv = InstallTriggerCheckLoadURIFromScript(cx, xpiURL);
             if (NS_FAILED(rv))
                 abortLoad = PR_TRUE;
 
             if (!abortLoad && iconURL)
             {
                 rv = InstallTriggerCheckLoadURIFromScript(cx, icon);
                 if (NS_FAILED(rv))
                     abortLoad = PR_TRUE;
             }
 
             if (!abortLoad)
             {
                 // Add the install item to the trigger collection
                 nsXPITriggerItem *item =
                     new nsXPITriggerItem( name, xpiURL.get(), icon.get(), hash );
                 if ( item )
                 {
                     trigger->Add( item );
                 }
                 else