Don't crash on p.toUri('') (dart-archive/path#114)

dart-lang · Dec 14, 2021 · b28f107 · b28f107
1 parent e089806
commit b28f107
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/pkgs/path/CHANGELOG.md b/pkgs/path/CHANGELOG.md
@@ -1,4 +1,6 @@
-## 1.8.1-dev
+## 1.8.1
+
+* Don't crash when an empty string is passed to `toUri()`.
 
 ## 1.8.0
 

diff --git a/pkgs/path/lib/src/internal_style.dart b/pkgs/path/lib/src/internal_style.dart
@@ -61,6 +61,7 @@ abstract class InternalStyle extends Style {
   /// Returns the URI that represents a relative path.
   @override
   Uri relativePathToUri(String path) {
+    if (path.isEmpty) return Uri();
     final segments = context.split(path);
 
     // Ensure that a trailing slash in the path produces a trailing slash in the

diff --git a/pkgs/path/pubspec.yaml b/pkgs/path/pubspec.yaml
@@ -1,5 +1,5 @@
 name: path
-version: 1.8.1-dev
+version: 1.8.1
 
 description: >-
   A string-based path manipulation library. All of the path operations you know

diff --git a/pkgs/path/test/posix_test.dart b/pkgs/path/test/posix_test.dart
@@ -590,6 +590,7 @@ void main() {
         Uri.parse('file:///_%7B_%7D_%60_%5E_%20_%22_%25_'));
     expect(context.toUri(r'_{_}_`_^_ _"_%_'),
         Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_'));
+    expect(context.toUri(''), Uri.parse(''));
   });
 
   group('prettyUri', () {

diff --git a/pkgs/path/test/url_test.dart b/pkgs/path/test/url_test.dart
@@ -871,6 +871,7 @@ void main() {
         Uri.parse('http://foo.com/_%7B_%7D_%60_%5E_%20_%22_%25_'));
     expect(context.toUri(r'_%7B_%7D_%60_%5E_%20_%22_%25_'),
         Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_'));
+    expect(context.toUri(''), Uri.parse(''));
   });
 
   group('prettyUri', () {

diff --git a/pkgs/path/test/windows_test.dart b/pkgs/path/test/windows_test.dart
@@ -759,6 +759,7 @@ void main() {
         Uri.parse('file:///C:/_%7B_%7D_%60_%5E_%20_%22_%25_'));
     expect(context.toUri(r'_{_}_`_^_ _"_%_'),
         Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_'));
+    expect(context.toUri(''), Uri.parse(''));
   });
 
   group('prettyUri', () {