handle bad paths in sys.path

lostmsu · lostmsu · commit 3b2958bcb59f · 2024-05-10T15:14:50.000-07:00
fixes #2376
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 ### Fixed
 
 -   Fixed RecursionError for reverse operators on C# operable types from python. See #2240
+-   Fixed probing for assemblies in `sys.path` failing when a path in `sys.path` has invalid characters. See #2376
 
 ## [3.0.3](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.3) - 2023-10-11
 
diff --git a/src/runtime/AssemblyManager.cs b/src/runtime/AssemblyManager.cs
@@ -200,6 +200,12 @@ static IEnumerable<string> FindAssemblyCandidates(string name)
                 }
                 else
                 {
+                    int invalidCharIndex = head.IndexOfAny(Path.GetInvalidPathChars());
+                    if (invalidCharIndex >= 0)
+                    {
+                        Exceptions.warn($"Path entry '{head}' has invalid char at position {invalidCharIndex}", Exceptions.ValueError);
+                        continue;
+                    }
                     path = Path.Combine(head, name);
                 }
 
diff --git a/src/runtime/Exceptions.cs b/src/runtime/Exceptions.cs
@@ -270,7 +270,7 @@ public static void warn(string message, BorrowedReference exception, int stackle
             }
 
             using var warn = Runtime.PyObject_GetAttrString(warnings_module.obj, "warn");
-            Exceptions.ErrorCheck(warn.Borrow());
+            warn.BorrowOrThrow();
 
             using var argsTemp = Runtime.PyTuple_New(3);
             BorrowedReference args = argsTemp.BorrowOrThrow();
@@ -283,7 +283,7 @@ public static void warn(string message, BorrowedReference exception, int stackle
             Runtime.PyTuple_SetItem(args, 2, level.StealOrThrow());
 
             using var result = Runtime.PyObject_CallObject(warn.Borrow(), args);
-            Exceptions.ErrorCheck(result.Borrow());
+            result.BorrowOrThrow();
         }
 
         public static void warn(string message, BorrowedReference exception)
diff --git a/tests/test_module.py b/tests/test_module.py
@@ -344,6 +344,20 @@ def test_clr_add_reference():
     with pytest.raises(FileNotFoundException):
         AddReference("somethingtotallysilly")
 
+
+def test_clr_add_reference_bad_path():
+    import sys
+    from clr import AddReference
+    from System.IO import FileNotFoundException
+    bad_path = "hello\0world"
+    sys.path.append(bad_path)
+    try:
+        with pytest.raises(FileNotFoundException):
+            AddReference("test_clr_add_reference_bad_path")
+    finally:
+        sys.path.remove(bad_path)
+
+
 def test_clr_get_clr_type():
     """Test clr.GetClrType()."""
     from clr import GetClrType

Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,12 @@ static IEnumerable<string> FindAssemblyCandidates(string name)`
`200`	`200`	`}`
`201`	`201`	`else`
`202`	`202`	`{`
	`203`	`+ int invalidCharIndex = head.IndexOfAny(Path.GetInvalidPathChars());`
	`204`	`+ if (invalidCharIndex >= 0)`
	`205`	`+ {`
	`206`	`+ Exceptions.warn($"Path entry '{head}' has invalid char at position {invalidCharIndex}", Exceptions.ValueError);`
	`207`	`+ continue;`
	`208`	`+ }`
`203`	`209`	`path = Path.Combine(head, name);`
`204`	`210`	`}`
`205`	`211`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public static void warn(string message, BorrowedReference exception, int stackle`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`using var warn = Runtime.PyObject_GetAttrString(warnings_module.obj, "warn");`
`273`		`- Exceptions.ErrorCheck(warn.Borrow());`
	`273`	`+ warn.BorrowOrThrow();`
`274`	`274`
`275`	`275`	`using var argsTemp = Runtime.PyTuple_New(3);`
`276`	`276`	`BorrowedReference args = argsTemp.BorrowOrThrow();`
`@@ -283,7 +283,7 @@ public static void warn(string message, BorrowedReference exception, int stackle`
`283`	`283`	`Runtime.PyTuple_SetItem(args, 2, level.StealOrThrow());`
`284`	`284`
`285`	`285`	`using var result = Runtime.PyObject_CallObject(warn.Borrow(), args);`
`286`		`- Exceptions.ErrorCheck(result.Borrow());`
	`286`	`+ result.BorrowOrThrow();`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`public static void warn(string message, BorrowedReference exception)`