check for embedded NUL char in jl_load (for include) (#16233)

* check for embedded NUL char in jl_load (for include) * use Core.include in test
JuliaLang · May 21, 2016 · cac984e · cac984e
1 parent 99bf23d
commit cac984e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/ast.c b/src/ast.c
@@ -739,6 +739,7 @@ jl_value_t *jl_parse_eval_all(const char *fname, size_t len,
         fl_free_gc_handles(fl_ctx, 1);
     }
     else {
+        assert(memchr(fname, 0, len) == NULL); // was checked already in jl_load
         ast = fl_applyn(fl_ctx, 1, symbol_value(symbol(fl_ctx, "jl-parse-file")), f);
     }
     fl_free_gc_handles(fl_ctx, 1);

diff --git a/src/toplevel.c b/src/toplevel.c
@@ -569,6 +569,8 @@ JL_DLLEXPORT jl_value_t *jl_toplevel_eval(jl_value_t *v)
 
 JL_DLLEXPORT jl_value_t *jl_load(const char *fname, size_t len)
 {
+    if (NULL != memchr(fname, 0, len))
+        jl_exceptionf(jl_argumenterror_type, "file name may not contain \\0");
     if (jl_current_module->istopmod) {
         jl_printf(JL_STDOUT, "%s\r\n", fname);
 #ifdef _OS_WINDOWS_

diff --git a/test/loading.jl b/test/loading.jl
@@ -4,6 +4,8 @@ using Base.Test
 
 @test @__LINE__ == 5
 
+@test_throws ArgumentError Core.include("test_sourcepath.jl\0")
+
 include("test_sourcepath.jl")
 thefname = "the fname!//\\&\0\1*"
 @test include_string("include_string_test() = @__FILE__", thefname)() == Base.source_path()