Bug 1470771: Follow-up: Fix null deref in Windows GPU process. r=me

intl/strres/nsStringBundle.cpp

@@ -212,8 +212,11 @@ public:
     if (mMapFile.isSome()) {
       return mMapSize;
     }
+    if (mStringMap) {
       return mStringMap->MapSize();
     }
+    return 0;
+  }
 
   bool Initialized() const { return mStringMap || mMapFile.isSome(); }
 
@@ -388,9 +391,7 @@ nsStringBundleBase::CollectReports(nsIHandleReportCallback* aHandleReport,
   size_t heapSize = SizeOfIncludingThis(MallocSizeOf);
 
   nsAutoCStringN<256> path("explicit/string-bundles/");
-  {
-    RefPtr<SharedStringBundle> shared = do_QueryObject(this);
-    if (shared) {
+  if (RefPtr<SharedStringBundle> shared = do_QueryObject(this)) {
     path.AppendLiteral("SharedStringBundle");
     if (XRE_IsParentProcess()) {
       sharedSize = shared->MapSize();
@@ -398,7 +399,6 @@ nsStringBundleBase::CollectReports(nsIHandleReportCallback* aHandleReport,
   } else {
     path.AppendLiteral("nsStringBundle");
   }
-  }
 
   path.AppendLiteral("(url=\"");
   path.Append(escapedURL);