Fixed an nsString usage oopsie

content/html/style/src/nsCSSParser.cpp

@@ -2458,13 +2458,14 @@ PRBool CSSParserImpl::ParseURL(PRInt32& aErrorCode, nsCSSValue& aValue)
       // XXX editors won't like this - too bad for now
       nsAutoString absURL;
       if (nsnull != mURL) {
-        nsString baseURL;
+        nsAutoString baseURL;
         nsresult rv;
 #ifdef NECKO
-		nsCOMPtr<nsIURI> base;
-		rv = mURL->Clone(getter_AddRefs(base));
-		if (NS_SUCCEEDED(rv))
-			rv = NS_MakeAbsoluteURI(nsCAutoString(tk->mIdent), base, absURL);
+        nsCOMPtr<nsIURI> base;
+        rv = mURL->Clone(getter_AddRefs(base));
+        if (NS_SUCCEEDED(rv)) {
+          rv = NS_MakeAbsoluteURI(tk->mIdent, base, absURL);
+        }
 #else
         rv = NS_MakeAbsoluteURL(mURL, baseURL, tk->mIdent, absURL);
 #endif // NECKO

content/shared/src/nsXULAtoms.cpp

@@ -39,11 +39,13 @@ void nsXULAtoms::AddRefAtoms() {
     /* XUL Atoms registers the XUL name space ID because it's a convenient
        place to do this, if you don't want a permanent, "well-known" ID.
     */
-    if (NS_SUCCEEDED(NS_NewNameSpaceManager(&gNameSpaceManager)))
+    if (NS_SUCCEEDED(NS_NewNameSpaceManager(&gNameSpaceManager))) {
 //    gNameSpaceManager->CreateRootNameSpace(namespace);
-      gNameSpaceManager->RegisterNameSpace(kXULNameSpace, nameSpaceID);
-    else
+      nsAutoString nameSpace(kXULNameSpace);
+      gNameSpaceManager->RegisterNameSpace(nameSpace, nameSpaceID);
+    } else {
       NS_ASSERTION(0, "failed to create xul atoms namespace manager");
+    }
 
     // now register the atoms
 #define XUL_ATOM(_name, _value) _name = NS_NewAtom(_value);

layout/html/style/src/nsCSSParser.cpp

@@ -2458,13 +2458,14 @@ PRBool CSSParserImpl::ParseURL(PRInt32& aErrorCode, nsCSSValue& aValue)
       // XXX editors won't like this - too bad for now
       nsAutoString absURL;
       if (nsnull != mURL) {
-        nsString baseURL;
+        nsAutoString baseURL;
         nsresult rv;
 #ifdef NECKO
-		nsCOMPtr<nsIURI> base;
-		rv = mURL->Clone(getter_AddRefs(base));
-		if (NS_SUCCEEDED(rv))
-			rv = NS_MakeAbsoluteURI(nsCAutoString(tk->mIdent), base, absURL);
+        nsCOMPtr<nsIURI> base;
+        rv = mURL->Clone(getter_AddRefs(base));
+        if (NS_SUCCEEDED(rv)) {
+          rv = NS_MakeAbsoluteURI(tk->mIdent, base, absURL);
+        }
 #else
         rv = NS_MakeAbsoluteURL(mURL, baseURL, tk->mIdent, absURL);
 #endif // NECKO

layout/style/nsCSSParser.cpp

@@ -2458,13 +2458,14 @@ PRBool CSSParserImpl::ParseURL(PRInt32& aErrorCode, nsCSSValue& aValue)
       // XXX editors won't like this - too bad for now
       nsAutoString absURL;
       if (nsnull != mURL) {
-        nsString baseURL;
+        nsAutoString baseURL;
         nsresult rv;
 #ifdef NECKO
-		nsCOMPtr<nsIURI> base;
-		rv = mURL->Clone(getter_AddRefs(base));
-		if (NS_SUCCEEDED(rv))
-			rv = NS_MakeAbsoluteURI(nsCAutoString(tk->mIdent), base, absURL);
+        nsCOMPtr<nsIURI> base;
+        rv = mURL->Clone(getter_AddRefs(base));
+        if (NS_SUCCEEDED(rv)) {
+          rv = NS_MakeAbsoluteURI(tk->mIdent, base, absURL);
+        }
 #else
         rv = NS_MakeAbsoluteURL(mURL, baseURL, tk->mIdent, absURL);
 #endif // NECKO

layout/xul/content/src/nsXULAtoms.cpp

@@ -39,11 +39,13 @@ void nsXULAtoms::AddRefAtoms() {
     /* XUL Atoms registers the XUL name space ID because it's a convenient
        place to do this, if you don't want a permanent, "well-known" ID.
     */
-    if (NS_SUCCEEDED(NS_NewNameSpaceManager(&gNameSpaceManager)))
+    if (NS_SUCCEEDED(NS_NewNameSpaceManager(&gNameSpaceManager))) {
 //    gNameSpaceManager->CreateRootNameSpace(namespace);
-      gNameSpaceManager->RegisterNameSpace(kXULNameSpace, nameSpaceID);
-    else
+      nsAutoString nameSpace(kXULNameSpace);
+      gNameSpaceManager->RegisterNameSpace(nameSpace, nameSpaceID);
+    } else {
       NS_ASSERTION(0, "failed to create xul atoms namespace manager");
+    }
 
     // now register the atoms
 #define XUL_ATOM(_name, _value) _name = NS_NewAtom(_value);