fix #31686, segfault on invalid cmdline option (#31689)

JuliaLang · Apr 11, 2019 · 5ce94d8 · 5ce94d8 · nanosoldier · Apr 12, 2019
1 parent ccd9574
commit 5ce94d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/init.c b/src/init.c
@@ -222,6 +222,9 @@ static void jl_close_item_atexit(uv_handle_t *handle)
 
 JL_DLLEXPORT void jl_atexit_hook(int exitcode)
 {
+ if (jl_all_tls_states == NULL)
+ return;
+
  jl_ptls_t ptls = jl_get_ptls_states();
 
  if (exitcode == 0)

diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
@@ -172,7 +172,10 @@ let exename = `$(Base.julia_cmd()) --startup-file=no`
  # --procs
  @test readchomp(`$exename -q -p 2 -e "println(nworkers())"`) == "2"
  @test !success(`$exename -p 0`)
- @test !success(`$exename --procs=1.0`)
+ let p = run(`$exename --procs=1.0`, wait=false)
+ wait(p)
+ @test p.exitcode == 1 && p.termsignal == 0
+ end
 
  # --machine-file
  # this does not check that machine file works,