diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-16 16:43:50 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-16 16:43:50 -0700 |
| commit | 9666529b5a5be1fcde82caadc2fe2efa5ea81e49 (patch) | |
| tree | ac1b44121f8fa60f70fe167f3f2775c7895ec924 /src | |
| parent | 08d39251a79a964e4a3ac0d7d8a397c2b66a0808 (diff) | |
glx: Use initstate_r / random_r instead of corrupting global random number state
Previously srandom and random were used. This cause the global random
number generator state to be modified. This caused problems for
applications that called srandom before calling into GLX. By using
local state the global state is left unmodified.
This should fix bug #23774.
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/x11/glxhash.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/glx/x11/glxhash.c b/src/glx/x11/glxhash.c index 74cd4f344d..7d28ada49c 100644 --- a/src/glx/x11/glxhash.c +++ b/src/glx/x11/glxhash.c @@ -87,9 +87,13 @@ #define HASH_ALLOC malloc #define HASH_FREE free -#define HASH_RANDOM_DECL -#define HASH_RANDOM_INIT(seed) srandom(seed) -#define HASH_RANDOM random() +#define HASH_RANDOM_DECL struct random_data rd; int32_t rv; char rs[256] +#define HASH_RANDOM_INIT(seed) \ + do { \ + (void) memset(&rd, 0, sizeof(rd)); \ + (void) initstate_r(seed, rs, sizeof(rs), &rd); \ + } while(0) +#define HASH_RANDOM ((void) random_r(&rd, &rv), rv) #define HASH_RANDOM_DESTROY typedef struct __glxHashBucket |