From e5b66aadaf4dcf833b357bb672948e1938a9acb0 Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 10 Jul 2020 16:10:05 +0200 Subject: Fix try_url/1 parsing of uri_parse result format, reported by Dialyzer --- src/misc.erl | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/misc.erl b/src/misc.erl index 85d11da4a..6402e9419 100644 --- a/src/misc.erl +++ b/src/misc.erl @@ -357,18 +357,19 @@ try_url(URL0) -> V when is_binary(V) -> binary_to_list(V); _ -> URL0 end, - case uri_parse(URL) of - {ok, {Scheme, _, _, _, _, _}} when Scheme /= http, Scheme /= https -> + try uri_parse(URL) of + {ok, Scheme, _, _, _} when Scheme /= "http", Scheme /= "https" -> ?ERROR_MSG("Unsupported URI scheme: ~ts", [URL]), erlang:error(badarg); - {ok, {_, _, Host, _, _, _}} when Host == ""; Host == <<"">> -> + {ok, _, Host, _, _} when Host == ""; Host == <<"">> -> ?ERROR_MSG("Invalid URL: ~ts", [URL]), erlang:error(badarg); - {ok, _} -> - iolist_to_binary(URL); - {error, _} -> - ?ERROR_MSG("Invalid URL: ~ts", [URL]), - erlang:error(badarg) + {ok, _, _, _, _} -> + iolist_to_binary(URL) + catch + error:_ -> + ?ERROR_MSG("Invalid URL: ~ts", [URL]), + erlang:error(badarg) end. -spec css_dir() -> file:filename(). -- cgit v1.2.3