gitpython-developers
diff --git a/‎git/objects/submodule/base.py‎
Lines changed: 8 additions & 0 deletions b/‎git/objects/submodule/base.py‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎test/test_submodule.py‎
Lines changed: 36 additions & 0 deletions b/‎test/test_submodule.py‎
Lines changed: 36 additions & 0 deletions
@@ -6,6 +6,7 @@
 import gc
 from io import BytesIO
 import logging
+import ntpath
 import os
 import os.path as osp
 import stat
@@ -305,6 +306,13 @@ def _config_parser_constrained(self, read_only: bool) -> SectionConstraint:
     @classmethod
     def _module_abspath(cls, parent_repo: "Repo", path: PathLike, name: str) -> PathLike:
         if cls._need_gitfile_submodules(parent_repo.git):
+            if (
+                not name
+                or name.startswith(("/", "\\"))
+                or ntpath.splitdrive(name)[0]
+                or ".." in name.replace("\\", "/").split("/")
+            ):
+                raise ValueError("Invalid submodule name %r" % name)
             return osp.join(parent_repo.git_dir, "modules", name)
         if parent_repo.working_tree_dir:
             return osp.join(parent_repo.working_tree_dir, path)
 
@@ -925,6 +925,42 @@ def test_update_submodule_with_relative_path(self, rwdir):
 
         cloned_repo.submodule_update(init=True, recursive=True)
 
+    @with_rw_directory
+    @_patch_git_config("protocol.file.allow", "always")
+    def test_update_rejects_parent_component_in_name(self, rwdir):
+        source = git.Repo.init(osp.join(rwdir, "source"))
+        source.git.commit(m="initial commit", allow_empty=True)
+
+        parent = git.Repo.init(osp.join(rwdir, "parent"))
+        parent.git.submodule("add", source.working_tree_dir, "module")
+        parent.index.commit("add submodule")
+        modules_file = Path(parent.working_tree_dir) / ".gitmodules"
+        modules_file.write_text(
+            modules_file.read_text().replace('submodule "module"', 'submodule "../../../escaped/module"')
+        )
+        parent.index.add([".gitmodules"])
+        parent.index.commit("change submodule name")
+
+        clone = git.Repo.clone_from(parent.working_tree_dir, osp.join(rwdir, "clone"))
+        with pytest.raises(ValueError, match="submodule name"):
+            clone.submodules[0].update(init=True)
+        assert not osp.exists(osp.join(rwdir, "escaped"))
+        invalid_names = (
+            "",
+            "..",
+            "../module",
+            R"..\module",
+            "nested/../module",
+            R"nested\..\module",
+            "/module",
+            R"\module",
+            "C:module",
+            R"C:\module",
+        )
+        for name in invalid_names:
+            with pytest.raises(ValueError, match="submodule name"):
+                Submodule._module_abspath(clone, "module", name)
+
     @with_rw_directory
     @_patch_git_config("protocol.file.allow", "always")
     def test_list_only_valid_submodules(self, rwdir):