From f7ee340593a7e69eb37f9f52b903a19d65e6b22e Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Wed, 15 May 2019 09:50:16 +0200 Subject: [xmerl] Fix parse bug when checking the character encoding The parser chrashed when an endmarker was missing when parsing attribute values during the character encoding check. --- lib/xmerl/src/xmerl_sax_parser.erl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl index fe836fd8cd..2767d02552 100644 --- a/lib/xmerl/src/xmerl_sax_parser.erl +++ b/lib/xmerl/src/xmerl_sax_parser.erl @@ -369,8 +369,8 @@ parse_eq(_, State) -> %%---------------------------------------------------------------------- parse_value(<>, State) when ?is_whitespace(C) -> parse_value(Rest, State); -parse_value(<>, _State) when C == $'; C == $" -> - parse_value_1(Rest, C, []); +parse_value(<>, State) when C == $'; C == $" -> + parse_value_1(Rest, C, [], State); parse_value(_, State) -> ?fatal_error(State, "\', \" or whitespace expected"). @@ -383,10 +383,12 @@ parse_value(_, State) -> %% Rest = binary() %% Description: Parsing an attribute value from the stream. %%---------------------------------------------------------------------- -parse_value_1(<>, Stop, Acc) -> +parse_value_1(<>, Stop, Acc, _State) -> {lists:reverse(Acc), Rest}; -parse_value_1(<>, Stop, Acc) -> - parse_value_1(Rest, Stop, [C |Acc]). +parse_value_1(<>, Stop, Acc, State) -> + parse_value_1(Rest, Stop, [C |Acc], State); +parse_value_1(_, _Stop, _Acc, State) -> + ?fatal_error(State, "end of input and no \' or \" found"). %%====================================================================== %% Default functions -- cgit v1.2.3