Changeset 104487 in vbox

Timestamp:

May 2, 2024 4:32:36 PM (7 months ago)

Author:

vboxsync

Message:

libs/xpcom/reflect: Some cleanups, bugref:3409

Location:

trunk/src/libs/xpcom18a4/xpcom/reflect

Files:

• xptcall/tests/TestXPTCInvoke.cpp (modified) (2 diffs)
• xptinfo/src/xptiInterfaceInfoManager.cpp (modified) (2 diffs)
• xptinfo/src/xptiManifest.cpp (modified) (5 diffs)
• xptinfo/src/xptiZipLoader.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp

@@ -1066 +1066 @@
 /***************************/
 
-FooImpl::FooImpl() : Name("FooImpl")
+FooImpl::FooImpl() : Name("FooImpl"), SomeData1(0), SomeData2(0)
 {
 }
@@ -1086 +1086 @@
 /***************************/
 
-BarImpl::BarImpl() : Name("BarImpl")
+BarImpl::BarImpl() : Name("BarImpl"), SomeData1(0), SomeData2(0)
 {
 }

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp

@@ -356 +356 @@
     XPTState *state = nsnull;
     XPTCursor cursor;
-    PRInt32 flen;
-    PRInt64 fileSize;
-    
-    PRBool saveFollowLinks;
-    aFile->GetFollowLinks(&saveFollowLinks);
-    aFile->SetFollowLinks(PR_TRUE);
-
-    if(NS_FAILED(aFile->GetFileSize(&fileSize)) || !(flen = nsInt64(fileSize)))
-    {
-        aFile->SetFollowLinks(saveFollowLinks);
-        return nsnull;
-    }
-
-    whole = new char[flen];
-    if (!whole)
-    {
-        aFile->SetFollowLinks(saveFollowLinks);
-        return nsnull;
-    }
-
-    // all exits from on here should be via 'goto out' 
-    int vrc = VINF_SUCCESS;
-    size_t cbRead = 0;
-    RTFILE hFile = NIL_RTFILE;
+
     nsCAutoString pathName;
     if (NS_FAILED(aFile->GetNativePath(pathName)))
+        return nsnull;
+
+
+    // all exits from on here should be via 'goto out' 
+    RTFILE hFile = NIL_RTFILE;
+
+    int vrc = RTFileOpen(&hFile, pathName.get(),
+                         RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
+    if (RT_FAILURE(vrc))
+        return nsnull;
+
+    uint64_t cbFile = 0;
+    vrc = RTFileQuerySize(hFile, &cbFile);
+    if (RT_FAILURE(vrc) || cbFile >= 128 * _1M)
+    {
+        RTFileClose(hFile);
+        return nsnull;
+    }
+
+    whole = new char[cbFile];
+    if (!whole)
+    {
+        RTFileClose(hFile);
+        return nsnull;
+    }
+
+    size_t cbRead = 0;
+    vrc = RTFileRead(hFile, whole, cbFile, &cbRead);
+    if(RT_FAILURE(vrc) || cbRead < cbFile)
         goto out;
 
-    vrc = RTFileOpen(&hFile, pathName.get(),
-                     RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
-    if (RT_FAILURE(vrc))
-        goto out;
-
-    vrc = RTFileRead(hFile, whole, flen, &cbRead);
-    if(RT_FAILURE(vrc) || cbRead < flen)
-        goto out;
-
-    if(!(state = XPT_NewXDRState(XPT_DECODE, whole, flen)))
+    if(!(state = XPT_NewXDRState(XPT_DECODE, whole, cbFile)))
     {
         goto out;
@@ -409 +406 @@
     }
 
- out:
-    if(hFile != NIL_RTFILE)
-        RTFileClose(hFile);
+out:
+    RTFileClose(hFile);
+
     if(state)
         XPT_DestroyXDRState(state);
-    if(whole)
-        delete [] whole;
-    aFile->SetFollowLinks(saveFollowLinks);
+
+    delete [] whole;
     return header;
 }

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiManifest.cpp

@@ -307 +307 @@
                        PRUint32* pLength)
 {
-    PRInt32 flen;
-    PRInt64 fileSize;
     char* whole = nsnull;
     PRBool success = PR_FALSE;
@@ -316 +314 @@
         return nsnull;
 
+    nsCAutoString pathName;
+    if (NS_FAILED(aFile->GetNativePath(pathName)))
+        return nsnull;
+
 #ifdef DEBUG
     {
         static PRBool shown = PR_FALSE;
 
-        nsCAutoString path;
-        if(!shown && NS_SUCCEEDED(aFile->GetNativePath(path)) && !path.IsEmpty())
+        if(!shown && !pathName.IsEmpty())
         {
-            fprintf(stderr, "Type Manifest File: %s\n", path.get());
+            fprintf(stderr, "Type Manifest File: %s\n", pathName.get());
             shown = PR_TRUE;
         }
@@ -329 +330 @@
 #endif
 
-    if(NS_FAILED(aFile->GetFileSize(&fileSize)) || !(flen = nsInt64(fileSize)))
+    RTFILE hFile = NIL_RTFILE;
+    int vrc = RTFileOpen(&hFile, pathName.get(),
+                         RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
+    if (RT_FAILURE(vrc))
         return nsnull;
 
-    whole = new char[flen];
+    uint64_t cbFile = 0;
+    vrc = RTFileQuerySize(hFile, &cbFile);
+    if (RT_FAILURE(vrc) || cbFile >= 128 * _1M)
+    {
+        RTFileClose(hFile);
+        return nsnull;
+    }
+
+    whole = new char[cbFile];
     if (!whole)
+    {
+        RTFileClose(hFile);
         return nsnull;
-
-    // All exits from on here should be via 'goto out'
-    int vrc = VINF_SUCCESS;
+    }
+
     size_t cbRead = 0;
-    RTFILE hFile = NIL_RTFILE;
-    nsCAutoString pathName;
-    if (NS_FAILED(aFile->GetNativePath(pathName)))
-        goto out;
-
-    vrc = RTFileOpen(&hFile, pathName.get(),
-                     RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
-    if (RT_FAILURE(vrc))
-        goto out;
-
-    vrc = RTFileRead(hFile, whole, flen, &cbRead);
-    if(RT_FAILURE(vrc) || cbRead < flen)
+    vrc = RTFileRead(hFile, whole, cbFile, &cbRead);
+    if(RT_FAILURE(vrc) || cbRead < cbFile)
         goto out;
 
@@ -365 +368 @@
     }
 
-    *pLength = flen;
+    *pLength = (uint32_t)cbFile;
     return whole;
 }
@@ -705 +708 @@
 
  out:
-    if(whole)
-        delete [] whole;
+    delete [] whole;
 
     if(!succeeded)

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/src/xptiZipLoader.cpp

@@ -107 +107 @@
     if(state)
         XPT_DestroyXDRState(state);
-    if(whole)
-        delete [] whole;
+
+    delete [] whole;
     return header;
 }