Merge branch 'kuba/stdlib/fix_normalize_undefined_path_crash/OTP-1926…

…6' into maint-27 * kuba/stdlib/fix_normalize_undefined_path_crash/OTP-19266: stdlib: fix normalize missing path crash
erlang · Oct 17, 2024 · 7691102 · 7691102
2 parents 676938e + 2002917
commit 7691102
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/stdlib/src/uri_string.erl b/lib/stdlib/src/uri_string.erl
@@ -2734,7 +2734,7 @@ to_lower(<<>>, Acc) ->
 %% 6.2.2.3. Path Segment Normalization
 %% 5.2.4.   Remove Dot Segments
 normalize_path_segment(Map) ->
-    Path = maps:get(path, Map, undefined),
+    Path = maps:get(path, Map, <<>>),
     Map#{path => remove_dot_segments(Path)}.
 
 

diff --git a/lib/stdlib/test/uri_string_SUITE.erl b/lib/stdlib/test/uri_string_SUITE.erl
@@ -1073,7 +1073,13 @@ normalize_map(_Config) ->
                                host => <<"localhost">>}),
     <<"yeti://localhost">> =
         uri_string:normalize(#{scheme => <<"yeti">>,port => undefined,path => <<>>,
-                               host => <<"localhost">>}).
+                               host => <<"localhost">>}),
+    <<"yeti://localhost">> =
+        uri_string:normalize(#{scheme => <<"yeti">>,port => undefined,
+                               host => <<"localhost">>}),
+    "yeti://localhost" =
+        uri_string:normalize(#{scheme => "yeti",port => undefined,
+                               host => "localhost"}).
 
 normalize_return_map(_Config) ->
     #{scheme := "http",path := "/a/g",host := "localhost-örebro"} =