com php-src: remove loop: win32/winutil.c
| From: | Anatol Belski | Date: | Sun, 12 Feb 2017 18:25:23 +0000 |
| Subject: | com php-src: remove loop: win32/winutil.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97087@lists.php.net to get a copy of this message | ||
Commit: 7b9f93b3f9f89e866d43aad3730e592a77c70f51
Author: Anatol Belski <ab@php.net> Sun, 12 Feb 2017 19:25:23 +0100
Parents: 97d620449cef55410ecd93964f9bff4c9dc7247d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b9f93b3f9f89e866d43aad3730e592a77c70f51
Log:
remove loop
The limit is big enough, and it's questionable such amount of
random data can ever make sense anyway..
Changed paths:
M win32/winutil.c
Diff:
diff --git a/win32/winutil.c b/win32/winutil.c
index 40a8700..d3a61f1 100644
--- a/win32/winutil.c
+++ b/win32/winutil.c
@@ -94,22 +94,8 @@ PHP_WINUTIL_API int php_win32_get_random_bytes(unsigned char *buf, size_t size)
}
#endif
-#if ZEND_ENABLE_ZVAL_LONG64
- BOOL call_ret;
- size_t got = 0;
-
- do {
- ULONG to_read = (ULONG)(size - got);
- call_ret = NT_SUCCESS(BCryptGenRandom(bcrypt_algo, buf, to_read, 0));
- if (call_ret) {
- got += to_read;
- buf += to_read;
- }
- } while (call_ret && got < size);
- ret = (got == size);
-#else
- ret = NT_SUCCESS(BCryptGenRandom(bcrypt_algo, buf, size, 0));
-#endif
+ /* No sense to loop here, the limit is huge enough. */
+ ret = NT_SUCCESS(BCryptGenRandom(bcrypt_algo, buf, (ULONG)size, 0));
return ret ? SUCCESS : FAILURE;
}