c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

dict: Handle ENOSYS from getentropy gracefully

Browse Source 
Should fix #854.
This commit is contained in:
Nick Wellnhofer 2025-02-02 13:13:20 +01:00
parent 6208f86edd
commit aee5563c8c
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dict.c
View File

@ -928,14 +928,15 @@ xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) {
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <bcrypt.h>
#elif defined(HAVE_GETENTROPY)
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_RANDOM_H
#include <sys/random.h>
#endif
#else
#if defined(HAVE_GETENTROPY)
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_RANDOM_H
#include <sys/random.h>
#endif
#endif
#include <time.h>
#endif
@ -965,9 +966,21 @@ xmlInitRandom(void) {
"error code %lu\n", GetLastError());
abort();
}
#elif defined(HAVE_GETENTROPY)
#else
int var;
#if defined(HAVE_GETENTROPY)
while (1) {
if (getentropy(globalRngState, sizeof(globalRngState)) == 0)
return;
/*
* This most likely means that libxml2 was compiled on
* a system supporting certain system calls and is running
* on a system that doesn't support these calls, as can
* be the case on Linux.
*/
if (errno == ENOSYS)
break;
if (errno != EINTR) {
@ -976,8 +989,7 @@ xmlInitRandom(void) {
abort();
}
}
#else
int var;
#endif
globalRngState[0] =
(unsigned) time(NULL) ^