Merge pull request #10876 from JuliaLang/tk/fix10865

Fix #10865, Windows julia segfaulting without sys.dll
JuliaLang · Apr 19, 2015 · 39c9d1b · 39c9d1b
2 parents 061e648 + a1da499
commit 39c9d1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -50,4 +50,5 @@ build_script:
 
 test_script:
   - usr\bin\julia -e "versioninfo()"
+  - copy usr\lib\julia\sys.ji local.ji && usr\bin\julia -J local.ji -e "true" && del local.ji
   - cd test && ..\usr\bin\julia runtests.jl all
diff --git a/src/dlload.c b/src/dlload.c
@@ -121,8 +121,7 @@ static uv_lib_t *jl_load_dynamic_library_(const char *modname, unsigned flags, i
                     else
                         snprintf(path, PATHBUF, "%s" PATHSEPSTRING "%s%s", dl_path, modname, ext);
                     if (handle->errmsg) {
-                        free(handle->errmsg);
-                        handle->errmsg = NULL;
+                        uv_dlclose(handle);
                     }
                     error = jl_uv_dlopen(path, handle, flags);
                     if (!error) goto done;
@@ -137,8 +136,7 @@ static uv_lib_t *jl_load_dynamic_library_(const char *modname, unsigned flags, i
         /* try loading from standard library path */
         snprintf(path, PATHBUF, "%s%s", modname, ext);
         if (handle->errmsg) {
-            free(handle->errmsg);
-            handle->errmsg = NULL;
+            uv_dlclose(handle);
         }
         error = jl_uv_dlopen(path, handle, flags);
         if (!error) goto done;