zig

commit 1110eafe9bd19ff69e9a7e488a7e9613fa909aeb (tree)
parent baafb8a491c296fbf434c8cf44d9485e8f2c729c
Author: LordMZTE <lord@mzte.de>
Date:   Fri,  1 Jul 2022 12:21:06 +0200

Module: fix error message importing file starting with root path

Diffstat:
M
src/Module.zig
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/Module.zig b/src/Module.zig
@@ -4694,7 +4694,11 @@ pub fn importFile(
     const resolved_root_path = try std.fs.path.resolve(gpa, &[_][]const u8{cur_pkg_dir_path});
     defer gpa.free(resolved_root_path);
 
-    if (!mem.startsWith(u8, resolved_path, resolved_root_path)) {
+    if (!mem.startsWith(u8, resolved_path, resolved_root_path) or
+        // This prevents this check from triggering when the name of the
+        // imported file starts with the root path's directory name.
+        mem.indexOfAny(u8, &.{resolved_path[resolved_root_path.len]}, "/\\") == null)
+    {
         return error.ImportOutsidePkgPath;
     }
     // +1 for the directory separator here.