Skip to content

fix: use std::lock_guard in v8js_ini_string to prevent double-unlock #549

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

Open
Appla wants to merge 1 commit into
base: php8
Choose a base branch
from
Open

fix: use std::lock_guard in v8js_ini_string to prevent double-unlock #549

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
11 changes: 3 additions & 8 deletions v8js_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,11 @@ static bool v8js_ini_string(char **field, const zend_string *new_value)/* {{{ */
bool immutable = false;

#ifdef ZTS
v8js_process_globals.lock.lock();
std::lock_guard<std::mutex> lock(v8js_process_globals.lock);

if(v8js_process_globals.v8_initialized) {
v8js_process_globals.lock.unlock();
immutable = true;
}

v8js_process_globals.lock.unlock();
#else
immutable = V8JSG(v8_initialized);
#endif
Expand All @@ -61,11 +58,9 @@ static bool v8js_ini_string(char **field, const zend_string *new_value)/* {{{ */
*field = NULL;
}

if (!ZSTR_VAL(new_value)[0]) {
return SUCCESS;
if (ZSTR_VAL(new_value)[0]) {
*field = zend_strndup(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
}

*field = zend_strndup(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
}

return SUCCESS;
Expand Down