@@ -143,8 +143,7 @@ static bool throw_deprecation = false;
143
143
static bool trace_sync_io = false ;
144
144
static bool track_heap_objects = false ;
145
145
static const char * eval_string = nullptr ;
146
- static unsigned int preload_module_count = 0 ;
147
- static const char ** preload_modules = nullptr ;
146
+ static std::vector<std::string> preload_modules;
148
147
static const int v8_default_thread_pool_size = 4 ;
149
148
static int v8_thread_pool_size = v8_default_thread_pool_size;
150
149
static bool prof_process = false ;
@@ -3221,21 +3220,18 @@ void SetupProcessObject(Environment* env,
3221
3220
READONLY_PROPERTY (process, " _forceRepl" , True (env->isolate ()));
3222
3221
}
3223
3222
3224
- if (preload_module_count) {
3225
- CHECK (preload_modules);
3223
+ if (!preload_modules.empty ()) {
3226
3224
Local<Array> array = Array::New (env->isolate ());
3227
- for (unsigned int i = 0 ; i < preload_module_count ; ++i) {
3225
+ for (unsigned int i = 0 ; i < preload_modules. size () ; ++i) {
3228
3226
Local<String> module = String::NewFromUtf8 (env->isolate (),
3229
- preload_modules[i]);
3227
+ preload_modules[i]. c_str () );
3230
3228
array->Set (i, module );
3231
3229
}
3232
3230
READONLY_PROPERTY (process,
3233
3231
" _preload_modules" ,
3234
3232
array);
3235
3233
3236
- delete[] preload_modules;
3237
- preload_modules = nullptr ;
3238
- preload_module_count = 0 ;
3234
+ preload_modules.clear ();
3239
3235
}
3240
3236
3241
3237
// --no-deprecation
@@ -3587,13 +3583,13 @@ static void ParseArgs(int* argc,
3587
3583
const char ** new_exec_argv = new const char *[nargs];
3588
3584
const char ** new_v8_argv = new const char *[nargs];
3589
3585
const char ** new_argv = new const char *[nargs];
3590
- const char ** local_preload_modules = new const char *[nargs];
3586
+ bool use_bundled_ca = false ;
3587
+ bool use_openssl_ca = false ;
3591
3588
3592
3589
for (unsigned int i = 0 ; i < nargs; ++i) {
3593
3590
new_exec_argv[i] = nullptr ;
3594
3591
new_v8_argv[i] = nullptr ;
3595
3592
new_argv[i] = nullptr ;
3596
- local_preload_modules[i] = nullptr ;
3597
3593
}
3598
3594
3599
3595
// exec_argv starts with the first option, the other two start with argv[0].
@@ -3651,7 +3647,7 @@ static void ParseArgs(int* argc,
3651
3647
exit (9 );
3652
3648
}
3653
3649
args_consumed += 1 ;
3654
- local_preload_modules[preload_module_count++] = module ;
3650
+ preload_modules. push_back ( module ) ;
3655
3651
} else if (strcmp (arg, " --check" ) == 0 || strcmp (arg, " -c" ) == 0 ) {
3656
3652
syntax_check_only = true ;
3657
3653
} else if (strcmp (arg, " --interactive" ) == 0 || strcmp (arg, " -i" ) == 0 ) {
@@ -3749,16 +3745,6 @@ static void ParseArgs(int* argc,
3749
3745
memcpy (argv, new_argv, new_argc * sizeof (*argv));
3750
3746
delete[] new_argv;
3751
3747
*argc = static_cast <int >(new_argc);
3752
-
3753
- // Copy the preload_modules from the local array to an appropriately sized
3754
- // global array.
3755
- if (preload_module_count > 0 ) {
3756
- CHECK (!preload_modules);
3757
- preload_modules = new const char *[preload_module_count];
3758
- memcpy (preload_modules, local_preload_modules,
3759
- preload_module_count * sizeof (*preload_modules));
3760
- }
3761
- delete[] local_preload_modules;
3762
3748
}
3763
3749
3764
3750
0 commit comments