Skip to content

Fix double-free related to std::unique_ptr use #415

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
merged 4 commits into from
Jun 21, 2019
Merged

Fix double-free related to std::unique_ptr use #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30e2ac6
Call v8::RegisterExtension using unique_ptr
jalr May 10, 2019
c8be053
Add use_custom_libcxx flag
jalr May 10, 2019
93a46f6
don't manage/free v8::Extension* (v8 does that now)
stesie Jun 21, 2019
bac8a96
(travis) use v8 7.5
stesie Jun 21, 2019
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ services:
- docker

env:
- V8VER=7.1
- V8VER=7.5
PHPVER=7.0
- V8VER=7.1
- V8VER=7.5
PHPVER=7.1
- V8VER=7.1
- V8VER=7.5
PHPVER=7.2

script: make -f Makefile.travis test
2 changes: 1 addition & 1 deletion Makefile.travis
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Configure and build scripts for travis CI system
V8VER ?= 7.1
V8VER ?= 7.5

IMAGENAME ?= v8js-test

Expand Down
2 changes: 1 addition & 1 deletion README.Linux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ git checkout 6.4.388.18
gclient sync

# Setup GN
tools/dev/v8gen.py -vv x64.release -- is_component_build=true
tools/dev/v8gen.py -vv x64.release -- is_component_build=true use_custom_libcxx=false

# Build
ninja -C out.gn/x64.release/
Expand Down
8 changes: 3 additions & 5 deletions v8js_class.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ struct v8js_jsext {
int deps_count;
zend_string *name;
zend_string *source;
v8::Extension *extension;
};
/* }}} */

Expand Down Expand Up @@ -272,7 +271,6 @@ static void v8js_jsext_free_storage(v8js_jsext *jsext) /* {{{ */
if (jsext->deps) {
v8js_free_ext_strarr(jsext->deps, jsext->deps_count);
}
delete jsext->extension;

// Free the persisted non-interned strings we allocated.
if (jsext->name) {
Expand Down Expand Up @@ -1054,7 +1052,7 @@ static int v8js_register_extension(zend_string *name, zend_string *source, zval
zend_hash_copy(jsext->deps_ht, Z_ARRVAL_P(deps_arr), v8js_persistent_zval_ctor);
}

jsext->extension = new v8::Extension(ZSTR_VAL(jsext->name), ZSTR_VAL(jsext->source), jsext->deps_count, jsext->deps);
v8::Extension *extension = new v8::Extension(ZSTR_VAL(jsext->name), ZSTR_VAL(jsext->source), jsext->deps_count, jsext->deps);

if (!zend_hash_add_ptr(v8js_process_globals.extensions, jsext->name, jsext)) {
v8js_jsext_free_storage(jsext);
Expand All @@ -1068,8 +1066,8 @@ static int v8js_register_extension(zend_string *name, zend_string *source, zval
v8js_process_globals.lock.unlock();
#endif

jsext->extension->set_auto_enable(auto_enable ? true : false);
v8::RegisterExtension(jsext->extension);
extension->set_auto_enable(auto_enable ? true : false);
v8::RegisterExtension(std::unique_ptr<v8::Extension>(extension));

return SUCCESS;
}
Expand Down