Skip to content

replace ERR_NUM_ERRORS with PHP_OPENSSL_ERR_BUFFER_SIZE #21579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bukka merged 1 commit into from
Apr 2, 2026
Merged

replace ERR_NUM_ERRORS with PHP_OPENSSL_ERR_BUFFER_SIZE #21579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ext/openssl/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ void php_openssl_store_errors(void)
errors = OPENSSL_G(errors);

do {
errors->top = (errors->top + 1) % ERR_NUM_ERRORS;
errors->top = (errors->top + 1) % PHP_OPENSSL_ERR_BUFFER_SIZE;
if (errors->top == errors->bottom) {
errors->bottom = (errors->bottom + 1) % ERR_NUM_ERRORS;
errors->bottom = (errors->bottom + 1) % PHP_OPENSSL_ERR_BUFFER_SIZE;
}
errors->buffer[errors->top] = error_code;
} while ((error_code = ERR_get_error()));
Expand Down Expand Up @@ -4042,7 +4042,7 @@ PHP_FUNCTION(openssl_error_string)
RETURN_FALSE;
}

OPENSSL_G(errors)->bottom = (OPENSSL_G(errors)->bottom + 1) % ERR_NUM_ERRORS;
OPENSSL_G(errors)->bottom = (OPENSSL_G(errors)->bottom + 1) % PHP_OPENSSL_ERR_BUFFER_SIZE;
val = OPENSSL_G(errors)->buffer[OPENSSL_G(errors)->bottom];

if (val) {
Expand Down
4 changes: 3 additions & 1 deletion ext/openssl/php_openssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ extern zend_module_entry openssl_module_entry;
#define PHP_OPENSSL_API_VERSION 0x30200
#endif

#define PHP_OPENSSL_ERR_BUFFER_SIZE 16

#define OPENSSL_RAW_DATA 1
#define OPENSSL_ZERO_PADDING 2
#define OPENSSL_DONT_ZERO_PAD_KEY 4
Expand Down Expand Up @@ -65,7 +67,7 @@ extern zend_module_entry openssl_module_entry;
#endif

struct php_openssl_errors {
int buffer[ERR_NUM_ERRORS];
int buffer[PHP_OPENSSL_ERR_BUFFER_SIZE];
int top;
int bottom;
};
Expand Down
Loading