umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

add control_codes mode to strict parsing that rejects strings with

Browse source 
ascii control codes
This commit is contained in:
alisdair 2017-12-23 19:08:28 -08:00
parent 6a01f3a43b
commit e5bfa8a39e
4 changed files with 25 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/jsx_config.erl
View file

@ -78,7 +78,8 @@ parse_config([strict|Rest], Config) ->
strict_commas=true,
strict_utf8=true,
strict_single_quotes=true,
strict_escapes=true
strict_escapes=true,
strict_control_codes=true
});
parse_config([{strict, Strict}|Rest], Config) ->
parse_strict(Strict, Rest, Config);
@ -108,6 +109,8 @@ parse_strict([single_quotes|Strict], Rest, Config) ->
parse_strict(Strict, Rest, Config#config{strict_single_quotes=true});
parse_strict([escapes|Strict], Rest, Config) ->
parse_strict(Strict, Rest, Config#config{strict_escapes=true});
parse_strict([control_codes|Strict], Rest, Config) ->
parse_strict(Strict, Rest, Config#config{strict_control_codes=true});
parse_strict(_Strict, _Rest, _Config) ->
erlang:error(badarg).
@ -133,7 +136,7 @@ reduce_config(Input) -> reduce_config(Input, [], []).
reduce_config([], Output, Strict) ->
case length(Strict) of
0 -> lists:reverse(Output);
4 -> lists:reverse(Output) ++ [strict];
5 -> lists:reverse(Output) ++ [strict];
_ -> lists:reverse(Output) ++ [{strict, lists:reverse(Strict)}]
end;
reduce_config([strict_comments|Input], Output, Strict) ->
@ -144,6 +147,8 @@ reduce_config([strict_single_quotes|Input], Output, Strict) ->
reduce_config(Input, Output, [single_quotes] ++ Strict);
reduce_config([strict_escapes|Input], Output, Strict) ->
reduce_config(Input, Output, [escapes] ++ Strict);
reduce_config([strict_control_codes|Input], Output, Strict) ->
reduce_config(Input, Output, [control_codes] ++ Strict);
reduce_config([Else|Input], Output, Strict) ->
reduce_config(Input, [Else] ++ Output, Strict).
@ -205,6 +210,7 @@ config_test_() ->
strict_utf8 = true,
strict_single_quotes = true,
strict_escapes = true,
strict_control_codes = true,
stream = true,
uescape = true
},
@ -227,7 +233,8 @@ config_test_() ->
strict_commas = true,
strict_utf8 = true,
strict_single_quotes = true,
strict_escapes = true
strict_escapes = true,
strict_control_codes = true
},
parse_config([strict])
)
@ -300,6 +307,7 @@ config_to_list_test_() ->
strict_utf8 = true,
strict_single_quotes = true,
strict_escapes = true,
strict_control_codes = true,
stream = true,
uescape = true
}
@ -318,7 +326,8 @@ config_to_list_test_() ->
config_to_list(#config{strict_comments = true,
strict_utf8 = true,
strict_single_quotes = true,
strict_escapes = true})
strict_escapes = true,
strict_control_codes = true})
)},
{"error handler", ?_assertEqual(
[{error_handler, fun ?MODULE:fake_error_handler/3}],