Permalink
Browse files

Added guard for invalid field and values in headers

  • Loading branch information...
1 parent bec7094 commit 218eee148e1edbe9ea69743525ed31b9272b06af @gustehn gustehn committed Mar 12, 2013
Showing with 19 additions and 4 deletions.
  1. +13 −3 lib/inets/src/http_client/httpc.erl
  2. +6 −1 lib/inets/test/httpc_SUITE.erl
@@ -163,8 +163,13 @@ request(Method,
{error, Reason} ->
{error, Reason};
{ok, ParsedUrl} ->
- handle_request(Method, Url, ParsedUrl, Headers, [], [],
- HTTPOptions, Options, Profile)
+ case header_parse(Headers) of
+ {error, Reason} ->
+ {error, Reason};
+ _ ->
+ handle_request(Method, Url, ParsedUrl, Headers, [], [],
+ HTTPOptions, Options, Profile)
+ end
end;
request(Method,
@@ -1247,7 +1252,12 @@ uri_parse(URI, Opts) ->
%%--------------------------------------------------------------------------
-
+header_parse([]) ->
+ ok;
+header_parse([{Field, Value}|T]) when is_list(Field), is_list(Value) ->
+ header_parse(T);
+header_parse(_) ->
+ {error, {headers_error, not_strings}}.
child_name2info(undefined) ->
{error, no_such_service};
child_name2info(httpc_manager) ->
@@ -83,7 +83,8 @@ real_requests()->
stream_through_fun,
stream_through_mfa,
streaming_error,
- inet_opts
+ inet_opts,
+ invalid_headers
].
only_simulated() ->
@@ -795,6 +796,10 @@ headers_dummy(Config) when is_list(Config) ->
%%-------------------------------------------------------------------------
+invalid_headers(Config) ->
+ Request = {url(group_name(Config), "/dummy.html", Config), [{"cookie", undefined}]},
+ {error, _} = httpc:request(get, Request, [], []).
+
remote_socket_close(Config) when is_list(Config) ->
URL = url(group_name(Config), "/just_close.html", Config),
{error, socket_closed_remotely} = httpc:request(URL).

0 comments on commit 218eee1

Please sign in to comment.