blob: f9f8495582e71f3d9288479e3bb2e5c427dcc119 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
--- third_party/libxml/src/dict.c.orig 2022-05-19 14:06:27 UTC
+++ third_party/libxml/src/dict.c
@@ -135,7 +135,7 @@ static xmlMutexPtr xmlDictMutex = NULL;
static int xmlDictInitialized = 0;
#ifdef DICT_RANDOMIZATION
-#ifdef HAVE_RAND_R
+#if defined(HAVE_RAND_R) && !defined(HAVE_ARC4RANDOM)
/*
* Internal data for random function, protected by xmlDictMutex
*/
@@ -178,7 +178,7 @@ int __xmlInitializeDict(void) {
return(0);
xmlMutexLock(xmlDictMutex);
-#ifdef DICT_RANDOMIZATION
+#if defined(DICT_RANDOMIZATION) && !defined(HAVE_ARC4RANDOM)
#ifdef HAVE_RAND_R
rand_seed = time(NULL);
rand_r(& rand_seed);
@@ -198,13 +198,17 @@ int __xmlRandom(void) {
if (xmlDictInitialized == 0)
__xmlInitializeDict();
+#ifdef HAVE_ARC4RANDOM
+ ret = arc4random();
+#else
xmlMutexLock(xmlDictMutex);
-#ifdef HAVE_RAND_R
+# ifdef HAVE_RAND_R
ret = rand_r(& rand_seed);
-#else
+# else
ret = rand();
-#endif
+# endif
xmlMutexUnlock(xmlDictMutex);
+#endif
return(ret);
}
#endif
|
