Commit 782576db authored by Richard Levitte's avatar Richard Levitte
Browse files

Correct two problems, found by Martin Kochanski <cardbox@easynet.co.uk>: 

1. CreateToolhelp32Snapshot returns INVALID_HANDLE_VALUE, not NULL, on error.
2. On Windows CE, a snapshot handle is closed with CloseToolhelp32Snapshot,
   not CloseHandle.
parent e9dcc3fb

crypto/rand/rand_win.c

+10 −4
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ typedef BOOL (WINAPI *GETCURSORINFO)(PCURSORINFO); 
typedef DWORD (WINAPI *GETQUEUESTATUS)(UINT);



typedef HANDLE (WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);

typedef BOOL (WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE);

typedef BOOL (WINAPI *HEAP32FIRST)(LPHEAPENTRY32, DWORD, DWORD);

typedef BOOL (WINAPI *HEAP32NEXT)(LPHEAPENTRY32);

typedef BOOL (WINAPI *HEAP32LIST)(HANDLE, LPHEAPLIST32);
@@ -423,6 +424,7 @@ int RAND_poll(void) 
	if (kernel)

		{

		CREATETOOLHELP32SNAPSHOT snap;

		CLOSETOOLHELP32SNAPSHOT close_snap;

		HANDLE handle;



		HEAP32FIRST heap_first;
@@ -440,6 +442,8 @@ int RAND_poll(void) 


		snap = (CREATETOOLHELP32SNAPSHOT)

			GetProcAddress(kernel, "CreateToolhelp32Snapshot");

		close_snap = (CLOSETOOLHELP32SNAPSHOT)

			GetProcAddress(kernel, "CloseToolhelp32Snapshot");

		heap_first = (HEAP32FIRST) GetProcAddress(kernel, "Heap32First");

		heap_next = (HEAP32NEXT) GetProcAddress(kernel, "Heap32Next");

		heaplist_first = (HEAP32LIST) GetProcAddress(kernel, "Heap32ListFirst");
@@ -455,7 +459,7 @@ int RAND_poll(void) 
			heaplist_next && process_first && process_next &&

			thread_first && thread_next && module_first &&

			module_next && (handle = snap(TH32CS_SNAPALL,0))

			!= NULL)

			!= INVALID_HANDLE_VALUE)

			{

			/* heap list and heap walking */

                        /* HEAPLIST32 contains 3 fields that will change with
@@ -517,7 +521,9 @@ int RAND_poll(void) 
				do

					RAND_add(&m, m.dwSize, 9);

				while (module_next(handle, &m));



			if (close_snap)

				close_snap(handle);

			else

				CloseHandle(handle);

			}