Changeset 104493 in vbox

Timestamp:

May 2, 2024 4:45:44 PM (7 months ago)

Author:

vboxsync

Message:

libs/xpcom/components: Some smaller cleanups, bugref:3409

Location:

trunk/src/libs/xpcom18a4/xpcom/components

Files:

• nsComponentManager.cpp (modified) (6 diffs)
• nsNativeComponentLoader.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

@@ -695 +695 @@
     mStaticComponentLoader(0),
 #endif
+    mComponentsOffset(0),
+    mGREComponentsOffset(0),
     mShuttingDown(NS_SHUTDOWN_NEVERHAPPENED),
     mLoaderData(nsnull),
+    mNLoaderData(0),
+    mMaxNLoaderData(0),
     mRegistryDirty(PR_FALSE)
 {
@@ -1048 +1052 @@
         return NS_ERROR_FAILURE;
 
-    uint64_t fileSize;
-    vrc = RTFileQuerySize(hFile, &fileSize);
+    uint64_t cbFile;
+    vrc = RTFileQuerySize(hFile, &cbFile);
     if (RT_FAILURE(vrc))
     {
@@ -1056 +1060 @@
     }
 
-    PRInt32 flen = nsInt64((PRInt64)fileSize);
-    if (flen == 0)
+    if (cbFile == 0)
     {
         RTFileClose(hFile);
@@ -1064 +1067 @@
     }
 
-    char* registry = new char[flen+1];
+    /* Some arbitrary upper limit we should never reach. */
+    if (cbFile > 128 * _1M)
+    {
+        RTFileClose(hFile);
+        NS_WARNING("Persistent Registry too large!");
+        return NS_ERROR_FAILURE;
+    }
+
+    char* registry = new char[cbFile+1];
     if (!registry)
         goto out;
 
-    vrc = RTFileRead(hFile, registry, flen, &cbRead);
-    if (RT_FAILURE(vrc) || cbRead < flen)
+    vrc = RTFileRead(hFile, registry, cbFile, &cbRead);
+    if (RT_FAILURE(vrc) || cbRead < cbFile)
     {
         rv = NS_ERROR_FAILURE;
         goto out;
     }
-    registry[flen] = '\0';
-
-    reader.Init(registry, flen);
+    registry[cbFile] = '\0';
+
+    reader.Init(registry, (PRUint32)cbFile);
 
     if (ReadSectionHeader(reader, "HEADER"))
@@ -2609 +2620 @@
 
     entry = new (mem) nsFactoryEntry(aClass, aFactory, entry);
-
-    if (!entry)
-        return NS_ERROR_OUT_OF_MEMORY;
+    /* The following will never be true as we pass an already allocated memory buffer into new. */
+    //if (!entry)
+    //    return NS_ERROR_OUT_OF_MEMORY;
 
     factoryTableEntry->mFactoryEntry = entry;
@@ -2767 +2778 @@
                                          aRegistryName, aRegistryNameLen,
                                          typeIndex);
-        if (!entry)
-            return NS_ERROR_OUT_OF_MEMORY;
+        /* The following will never be true as we pass an already allocated memory buffer into new. */
+        //if (!entry)
+        //    return NS_ERROR_OUT_OF_MEMORY;
 
         nsFactoryTableEntry* factoryTableEntry =

trunk/src/libs/xpcom18a4/xpcom/components/nsNativeComponentLoader.cpp

@@ -208 +208 @@
                         || RTStrICmp(leafName.get() + (leafName.Length() - sizeof(".dSYM") + 1), ".dSYM"))
 #endif
-                        rv = RegisterComponentsInDir(when, dirEntry);
+                        RegisterComponentsInDir(when, dirEntry);
                 }
                 else
@@ -214 +214 @@
                     PRBool registered;
                     // This is a file. Try to register it.
-                    rv = AutoRegisterComponent(when, dirEntry, &registered);
+                    AutoRegisterComponent(when, dirEntry, &registered);
                 }
             }
@@ -836 +836 @@
     }
 
+    dll = new nsDll(spec, this);
     if (!dll)
-    {
-        dll = new nsDll(spec, this);
-        if (!dll)
-            return NS_ERROR_OUT_OF_MEMORY;
-    }
+        return NS_ERROR_OUT_OF_MEMORY;
 
     *aDll = dll;