Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 3e0de46

Browse files
Attributes / comments
1 parent 24d561e commit 3e0de46

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

‎Zend/zend.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ ZEND_API char *(*zend_getenv)(const char *name, size_t name_len);
9494
ZEND_API zend_string *(*zend_resolve_path)(zend_string *filename);
9595
ZEND_API zend_result (*zend_post_startup_cb)(void) = NULL;
9696
ZEND_API void (*zend_post_shutdown_cb)(void) = NULL;
97-
ZEND_API zend_result (*zend_os_csprng_random_bytes)(void *bytes, size_t size, char *errstr, size_t errstr_size) = NULL;
98-
ZEND_API zend_result (*zend_general_random_bytes)(zend_utility_general_random_state *state, void *bytes, size_t size) = NULL;
97+
ZEND_ATTRIBUTE_NONNULLZEND_API zend_result (*zend_os_csprng_random_bytes)(void *bytes, size_t size, char *errstr, size_t errstr_size) = NULL;
98+
ZEND_ATTRIBUTE_NONNULLZEND_API zend_result (*zend_general_random_bytes)(zend_utility_general_random_state *state, void *bytes, size_t size) = NULL;
9999

100100
/* This callback must be signal handler safe! */
101101
void (*zend_on_timeout)(int seconds);

‎Zend/zend.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,11 @@ extern void (*zend_printf_to_smart_string)(smart_string *buf, const char *format
347347
extern void (*zend_printf_to_smart_str)(smart_str *buf, const char *format, va_list ap);
348348
extern ZEND_API char *(*zend_getenv)(const char *name, size_t name_len);
349349
extern ZEND_API zend_string *(*zend_resolve_path)(zend_string *filename);
350-
extern ZEND_API zend_result (*zend_os_csprng_random_bytes)(void *bytes, size_t size, char *errstr, size_t errstr_size);
351-
extern ZEND_API zend_result (*zend_general_random_bytes)(zend_utility_general_random_state *state, void *bytes, size_t size);
350+
/* Generate 'size' random bytes into 'bytes' with the OS CSPRNG. */
351+
extern ZEND_ATTRIBUTE_NONNULL ZEND_API zend_result (*zend_os_csprng_random_bytes)(void *bytes, size_t size, char *errstr, size_t errstr_size);
352+
/* Generate 'size' random bytes into 'bytes' with a general purpose PRNG.
353+
* 'state' must be zeroed before the first call and can be reused. */
354+
extern ZEND_ATTRIBUTE_NONNULL ZEND_API zend_result (*zend_general_random_bytes)(zend_utility_general_random_state *state, void *bytes, size_t size);
352355

353356
/* These two callbacks are especially for opcache */
354357
extern ZEND_API zend_result (*zend_post_startup_cb)(void);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /