Skip to content

move __thread variables into heap storage #24365

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

Closed
henderkes wants to merge 1 commit into from
+26 −5
Closed

move __thread variables into heap storage #24365

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
2 changes: 1 addition & 1 deletion ext/standard/php_crypt_r.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static void to64(char *s, int32_t v, int n)
*/
char * php_md5_crypt_r(const char *pw, const char *salt, char *out)
{
ZEND_TLS char passwd[MD5_HASH_MAX_LEN], *p;
char *passwd = out, *p;
const char *sp, *ep;
unsigned char final[16];
unsigned int i, sl, pwl;
Expand Down
29 changes: 25 additions & 4 deletions ext/uri/uri_parser_whatwg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,19 @@
#include <arpa/inet.h>
#endif

ZEND_TLS lexbor_mraw_t lexbor_mraw = {0};
ZEND_TLS lxb_url_parser_t lexbor_parser = {0};
ZEND_TLS lxb_unicode_idna_t lexbor_idna = {0};
ZEND_TLS uint8_t lexbor_custom_url_map[256] = {0};
typedef struct {
lexbor_mraw_t mraw;
lxb_url_parser_t parser;
lxb_unicode_idna_t idna;
uint8_t custom_url_map[256];
} php_uri_whatwg_globals;

ZEND_TLS php_uri_whatwg_globals *whatwg_globals = NULL;

#define lexbor_mraw (whatwg_globals->mraw)
#define lexbor_parser (whatwg_globals->parser)
#define lexbor_idna (whatwg_globals->idna)
#define lexbor_custom_url_map (whatwg_globals->custom_url_map)

static const size_t lexbor_mraw_byte_size = 8192;

Expand Down Expand Up @@ -560,6 +569,8 @@ static zend_result php_uri_parser_whatwg_fragment_write(void *uri, const zval *v

PHP_RINIT_FUNCTION(uri_parser_whatwg)
{
whatwg_globals = ecalloc(1, sizeof(*whatwg_globals));

lxb_status_t status = lexbor_mraw_init(&lexbor_mraw, lexbor_mraw_byte_size);
if (status != LXB_STATUS_OK) {
goto fail;
Expand Down Expand Up @@ -591,18 +602,28 @@ PHP_RINIT_FUNCTION(uri_parser_whatwg)
lexbor_mraw_destroy(&lexbor_mraw, false);
memset(&lexbor_mraw, 0, sizeof(lexbor_mraw));

efree(whatwg_globals);
whatwg_globals = NULL;

return FAILURE;
}

ZEND_MODULE_POST_ZEND_DEACTIVATE_D(uri_parser_whatwg)
{
if (whatwg_globals == NULL) {
return SUCCESS;
}

lxb_unicode_idna_destroy(&lexbor_idna, false);
memset(&lexbor_idna, 0, sizeof(lexbor_idna));
lxb_url_parser_destroy(&lexbor_parser, false);
memset(&lexbor_parser, 0, sizeof(lexbor_parser));
lexbor_mraw_destroy(&lexbor_mraw, false);
memset(&lexbor_mraw, 0, sizeof(lexbor_mraw));

efree(whatwg_globals);
whatwg_globals = NULL;

return SUCCESS;
}

Expand Down
Loading