mirror of
git://git.gnupg.org/gnupg.git
synced 2025-02-01 16:33:02 +01:00
(rndw32_gather_random_fast): While adding data use the
size of the object and not the one of its address. Bug reported by Sascha Kiefer.
This commit is contained in:
parent
1517f0e945
commit
4d5285ee87
@ -1,3 +1,9 @@
|
||||
2005-03-23 Werner Koch <wk@g10code.com>
|
||||
|
||||
* rndw32.c (rndw32_gather_random_fast): While adding data use the
|
||||
size of the object and not the one of its address. Bug reported by
|
||||
Sascha Kiefer.
|
||||
|
||||
2005-03-07 Werner Koch <wk@g10code.com>
|
||||
|
||||
* primegen.c (is_prime): Free A2. Noted by pmike2001@mail.ru.
|
||||
@ -1212,7 +1218,7 @@ Mon Feb 16 10:08:47 1998 Werner Koch (wk@isil.d.shuttle.de)
|
||||
|
||||
|
||||
Copyright 1998, 1999, 2000, 2001, 2002, 2003,
|
||||
2004 Free Software Foundation, Inc.
|
||||
2004, 2005 Free Software Foundation, Inc.
|
||||
|
||||
This file is free software; as a special exception the author gives
|
||||
unlimited permission to copy and/or distribute it, with or without
|
||||
|
@ -654,13 +654,14 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester
|
||||
(*add) ( &kernelTime, sizeof (kernelTime), requester );
|
||||
(*add) ( &userTime, sizeof (userTime), requester );
|
||||
|
||||
/* Get the minimum and maximum working set size for the current process */
|
||||
/* Get the minimum and maximum working set size for the
|
||||
current process */
|
||||
GetProcessWorkingSetSize (handle, &minimumWorkingSetSize,
|
||||
&maximumWorkingSetSize);
|
||||
(*add) ( &minimumWorkingSetSize,
|
||||
sizeof (&minimumWorkingSetSize), requester );
|
||||
sizeof (minimumWorkingSetSize), requester );
|
||||
(*add) ( &maximumWorkingSetSize,
|
||||
sizeof (&maximumWorkingSetSize), requester );
|
||||
sizeof (maximumWorkingSetSize), requester );
|
||||
}
|
||||
|
||||
|
||||
@ -688,7 +689,7 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester
|
||||
if (QueryPerformanceCounter (&performanceCount)) {
|
||||
if ( debug_me )
|
||||
log_debug ("rndw32#gather_random_fast: perf data\n");
|
||||
(*add) (&performanceCount, sizeof (&performanceCount), requester);
|
||||
(*add) (&performanceCount, sizeof (performanceCount), requester);
|
||||
}
|
||||
else { /* Millisecond accuracy at best... */
|
||||
DWORD aword = GetTickCount ();
|
||||
|
Loading…
x
Reference in New Issue
Block a user