Changeset 6921 in vbox for trunk/include/VBox/com

Timestamp:

Feb 12, 2008 1:18:35 PM (17 years ago)

Author:

vboxsync

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

28073

Message:

Main: COM Arrays: Allow for zero-sized arrays.

File:

• trunk/include/VBox/com/array.h (modified) (4 diffs)

trunk/include/VBox/com/array.h

@@ -494 +494 @@
 #if defined (VBOX_WITH_XPCOM)
 
-        AssertReturn (aNewSize > 0, false);
-
-        m.arr = (T *) nsMemory::Alloc (aNewSize * sizeof (T));
+        /* Note: for zero-sized arrays, we use the size of 1 because whether
+         * malloc(0) returns a null pointer or not (which is used in isNull())
+         * is implementation-dependent according to the C standard. */
+
+        m.arr = (T *) nsMemory::Alloc (RT_MAX (aNewSize, 1) * sizeof (T));
         AssertReturn (m.arr != NULL, false);
 
@@ -505 +507 @@
 
 #else
-
-        AssertReturn (aNewSize > 0, false);
 
         SAFEARRAYBOUND bound = { aNewSize, 0 };
@@ -987 +987 @@
 #if defined (VBOX_WITH_XPCOM)
 
-        AssertReturn (aNewSize > 0, false);
-
-        Base::m.arr = (I **) nsMemory::Alloc (aNewSize * sizeof (I *));
+        /* Note: for zero-sized arrays, we use the size of 1 because whether
+         * malloc(0) returns a null pointer or not (which is used in isNull())
+         * is implementation-dependent according to the C standard. */
+
+        Base::m.arr = (I **) nsMemory::Alloc (RT_MAX (aNewSize, 1) * sizeof (I *));
         AssertReturn (Base::m.arr != NULL, false);
 
@@ -998 +1000 @@
 
 #else
-
-        AssertReturn (aNewSize > 0, false);
 
         SAFEARRAYBOUND bound = { aNewSize, 0 };