blob: ce42ad8fb0f66d8d3ac17a6cec27c2139f29a0ff (
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
|
--- src/3rdparty/chromium/third_party/libxml/src/dict.c.orig 2023-03-09 06:31:50 UTC
+++ src/3rdparty/chromium/third_party/libxml/src/dict.c
@@ -133,7 +133,7 @@ struct _xmlDict {
static xmlMutex xmlDictMutex;
#ifdef DICT_RANDOMIZATION
-#ifdef HAVE_RAND_R
+#if defined(HAVE_RAND_R) && !defined(HAVE_ARC4RANDOM)
/*
* Internal data for random function, protected by xmlDictMutex
*/
@@ -160,7 +160,7 @@ int xmlInitializeDict(void) {
int __xmlInitializeDict(void) {
xmlInitMutex(&xmlDictMutex);
-#ifdef DICT_RANDOMIZATION
+#if defined(DICT_RANDOMIZATION) && !defined(HAVE_ARC4RANDOM)
#ifdef HAVE_RAND_R
rand_seed = time(NULL);
rand_r(& rand_seed);
@@ -175,13 +175,17 @@ int __xmlInitializeDict(void) {
int __xmlRandom(void) {
int ret;
+#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
|
