Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Do read piefxis file fully before starting processing included file

Browse Source 
Previous method of processing files, could lead to mixing events generated
by parsers for multiple files, where we could get in inconsistant state.

After this change we gather all events generated by parser for single file,
before we start parsing any included file.

This fixes issue #3166
This commit is contained in:
Paweł Chmielowski 2020-02-18 15:02:14 +01:00
parent 9e1973a238
commit a19fdb717b
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ejabberd_piefxis.erl
View File

@ -296,17 +296,26 @@ process(#state{xml_stream_state = XMLStreamState, fd = Fd} = State) ->
end. end.
process_els(State) -> process_els(State) ->
Els = gather_els(State, []),
process_els(State, lists:reverse(Els)).
gather_els(State, List) ->
receive receive
{'$gen_event', El} -> {'$gen_event', El} ->
gather_els(State, [El | List])
after 0 ->
List
end.
process_els(State, [El | Tail]) ->
case process_el(El, State) of case process_el(El, State) of
{ok, NewState} -> {ok, NewState} ->
process_els(NewState); process_els(NewState, Tail);
Err -> Err ->
Err Err
end end;
after 0 -> process_els(State, []) ->
{ok, State} {ok, State}.
end.
process_el({xmlstreamstart, <<"server-data">>, Attrs}, State) -> process_el({xmlstreamstart, <<"server-data">>, Attrs}, State) ->
case fxml:get_attr_s(<<"xmlns">>, Attrs) of case fxml:get_attr_s(<<"xmlns">>, Attrs) of