Changeset 86273 in vbox

Timestamp:

Sep 24, 2020 5:38:58 PM (4 years ago)

Author:

vboxsync

Message:

xpcom/prmem.c: The java bridge allocates zero byte for an array, resulting in assertion + allocation error. Do a RT_MAX(size,1) to ensure that RTMemAlloc[Z] doesn't assert and returns a non-NULL value.

File:

• trunk/src/libs/xpcom18a4/nsprpub/pr/src/malloc/prmem.c (modified) (4 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/malloc/prmem.c

@@ -470 +470 @@
 
 #ifdef VBOX_USE_IPRT_IN_NSPR
-    return use_zone_allocator ? pr_ZoneMalloc(size) : RTMemAlloc(size);
+    return use_zone_allocator ? pr_ZoneMalloc(size) : RTMemAlloc(RT_MAX(size, 1));
 #else
     return use_zone_allocator ? pr_ZoneMalloc(size) : malloc(size);
@@ -482 +482 @@
     return use_zone_allocator ?
 #ifdef VBOX_USE_IPRT_IN_NSPR
-        pr_ZoneCalloc(nelem, elsize) : RTMemAllocZ(nelem * (size_t)elsize);
+        pr_ZoneCalloc(nelem, elsize) : RTMemAllocZ(RT_MAX(nelem * (size_t)elsize, 1));
 #else
         pr_ZoneCalloc(nelem, elsize) : calloc(nelem, elsize);
@@ -527 +527 @@
 #else
 # ifdef VBOX_USE_IPRT_IN_NSPR
-    return RTMemAlloc(size);
+    return RTMemAlloc(RT_MAX(size, 1));
 # else
     return malloc(size);
@@ -541 +541 @@
 #else
 # ifdef VBOX_USE_IPRT_IN_NSPR
-    return RTMemAllocZ(nelem * (size_t)elsize);
+    return RTMemAllocZ(RT_MAX(nelem * (size_t)elsize, 1));
 # else
     return calloc(nelem, elsize);