Changeset 104237 in vbox for trunk

Timestamp:

Apr 8, 2024 6:49:38 PM (10 months ago)

Author:

vboxsync

Message:

libs/libxml2-2.12.6: Try fixing the solaris builds where gcc chokes on the way the RNG is seeded, use our own IPRT API to get at a random value in xmlRandom(), bugref:10640

Location:

trunk/src/libs/libxml2-2.12.6

Files:

• dict.c (modified) (4 diffs)
• threads.c (modified) (2 diffs)

trunk/src/libs/libxml2-2.12.6/dict.c

@@ -31 +31 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/xmlstring.h>
+
+#ifdef VBOX
+# include <iprt/rand.h>
+#endif
 
 #ifndef SIZE_MAX
@@ -901 +905 @@
 }
 
+#ifndef VBOX
 /*
  * Pseudo-random generator
@@ -947 +952 @@
     return(result & 0xFFFFFFFF);
 }
+#endif
 
 unsigned
 xmlRandom(void) {
+#ifndef VBOX
 #ifdef XML_THREAD_LOCAL
     if (!localRngInitialized) {
@@ -969 +976 @@
     return(ret);
 #endif
-}
-
+#else
+    return RTRandU32();
+#endif
+}
+

trunk/src/libs/libxml2-2.12.6/threads.c

@@ -586 +586 @@
         xmlInitMemoryInternal(); /* Should come second */
         xmlInitGlobalsInternal();
+#ifndef VBOX
         xmlInitRandom();
+#endif
         xmlInitDictInternal();
         xmlInitEncodingInternal();
@@ -651 +653 @@
 
     xmlCleanupDictInternal();
+#ifndef VBOX
     xmlCleanupRandom();
+#endif
     xmlCleanupGlobalsInternal();
     /*