Changeset 104488 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

May 2, 2024 4:34:04 PM (10 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163010

Message:

libs/xpcom/ds: Add two missing error checks, add some missing field initialization, mark cases as fallthrough, bugref:3409

Location:

trunk/src/libs/xpcom18a4/xpcom/ds

Files:

• nsArrayEnumerator.cpp (modified) (1 diff)
• nsCRT.cpp (modified) (3 diffs)
• nsManifestLineReader.h (modified) (1 diff)
• nsSupportsArray.cpp (modified) (2 diffs)
• nsVoidArray.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/ds/nsArrayEnumerator.cpp

@@ -109 +109 @@
 
     // nsSimpleArrayEnumerator methods
-    nsCOMArrayEnumerator() : mIndex(0) {
+    nsCOMArrayEnumerator() : mIndex(0), mArraySize(0) {
     }
 

trunk/src/libs/xpcom18a4/xpcom/ds/nsCRT.cpp

@@ -51 +51 @@
  */
 
+#include <iprt/cdefs.h>
 
 #include "nsCRT.h"
@@ -370 +371 @@
             switch ( code_length )
               {  // falling through in each case
-                case 6:   h = (h>>28) ^ (h<<4) ^ (0x80 | ((U>>24) & 0x003F));
-                case 5:   h = (h>>28) ^ (h<<4) ^ (0x80 | ((U>>18) & 0x003F));
-                case 4:   h = (h>>28) ^ (h<<4) ^ (0x80 | ((U>>12) & 0x003F));
-                case 3:   h = (h>>28) ^ (h<<4) ^ (0x80 | ((U>>6 ) & 0x003F));
-                case 2:   h = (h>>28) ^ (h<<4) ^ (0x80 | ( U      & 0x003F));
+                case 6:   h = (h>>28) ^ (h<<4) ^ (0x80 | ((U>>24) & 0x003F)); RT_FALL_THROUGH();
+                case 5:   h = (h>>28) ^ (h<<4) ^ (0x80 | ((U>>18) & 0x003F)); RT_FALL_THROUGH();
+                case 4:   h = (h>>28) ^ (h<<4) ^ (0x80 | ((U>>12) & 0x003F)); RT_FALL_THROUGH();
+                case 3:   h = (h>>28) ^ (h<<4) ^ (0x80 | ((U>>6 ) & 0x003F)); RT_FALL_THROUGH();
+                case 2:   h = (h>>28) ^ (h<<4) ^ (0x80 | ( U      & 0x003F)); RT_FALL_THROUGH();
                 default:  code_length = 0;
                   break;
@@ -416 +417 @@
         return LL_Zero();
 
-    PRInt64 ll = LL_Zero(), digitll = LL_Zero();
+    PRInt64 ll = LL_Zero();
+    PRInt64 digitll;
 
     while (*str && *str >= '0' && *str <= '9') {

trunk/src/libs/xpcom18a4/xpcom/ds/nsManifestLineReader.h

@@ -45 +45 @@
 {
 public:
-    nsManifestLineReader() : mBase(nsnull) {} 
+    nsManifestLineReader()
+        : mCur(nsnull)
+        , mLength(0)
+        , mNext(nsnull)
+        , mBase(nsnull)
+        , mLimit(nsnull) {} 
     ~nsManifestLineReader() {}
 

trunk/src/libs/xpcom18a4/xpcom/ds/nsSupportsArray.cpp

@@ -222 +222 @@
 nsSupportsArray::Read(nsIObjectInputStream *aStream)
 {
-  nsresult rv;
-
   PRUint32 newArraySize;
-  rv = aStream->Read32(&newArraySize);
+  nsresult rv = aStream->Read32(&newArraySize);
+  if (NS_FAILED(rv))
+    return rv;
 
   if (newArraySize <= kAutoArraySize) {
@@ -665 +665 @@
 nsSupportsArray::Clone(nsISupportsArray* *result)
 {
-  nsresult rv;
   nsISupportsArray* newArray;
-  rv = NS_NewISupportsArray(&newArray);
+  nsresult rv = NS_NewISupportsArray(&newArray);
+  if (NS_FAILED(rv))
+    return rv;
+
   PRBool ok = EnumerateForwards(CopyElement, newArray);
   if (!ok) return NS_ERROR_OUT_OF_MEMORY;

trunk/src/libs/xpcom18a4/xpcom/ds/nsVoidArray.cpp

@@ -269 +269 @@
     {
       newCapacity = GetArraySize() + PR_MAX(kMaxGrowArrayBy,aGrowBy);
-      newSize = SIZEOF_IMPL(newCapacity);
+      //newSize = SIZEOF_IMPL(newCapacity); Not used below
     }
     else