Merge pull request #16218 from stevengj/jl_load_strlen

fix inconsistent use of strlen in jl_load
JuliaLang · May 6, 2016 · 775dc82 · 775dc82
2 parents fdc4a85 + bb2f67d
commit 775dc82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ast.c b/src/ast.c
@@ -722,7 +722,7 @@ jl_value_t *jl_parse_eval_all(const char *fname, size_t len,
     jl_ast_context_t *ctx = jl_ast_ctx_enter();
     fl_context_t *fl_ctx = &ctx->fl;
     value_t f, ast;
-    f = cvalue_static_cstring(fl_ctx, fname);
+    f = cvalue_static_cstrn(fl_ctx, fname, len);
     fl_gc_handle(fl_ctx, &f);
     if (content != NULL) {
         value_t t = cvalue_static_cstrn(fl_ctx, content, contentlen);

diff --git a/src/init.c b/src/init.c
@@ -647,7 +647,7 @@ void _julia_init(JL_IMAGE_SEARCH rel)
                 jl_current_module;
         }
 
-        jl_load("boot.jl", sizeof("boot.jl"));
+        jl_load("boot.jl", sizeof("boot.jl")-1);
         jl_get_builtin_hooks();
         jl_boot_file_loaded = 1;
         jl_init_box_caches();