Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Allow balanced expressions inside @(...) in ejabberd_sql_pt

This commit is contained in:
Alexey Shchepin 2016-02-12 16:26:51 +03:00
parent 99255631dd
commit 7f3bffe821
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ejabberd_sql_pt.erl
View File

@ -174,12 +174,12 @@ append_string(S, State) ->
State#state{query = [{str, S} | State#state.query]}.
parse_name(S, State) ->
parse_name(S, [], State).
parse_name(S, [], 0, State).
parse_name([], Acc, State) ->
parse_name([], _Acc, _Depth, State) ->
throw({error, State#state.loc,
"expected ')', found end of string"});
parse_name([$), T | S], Acc, State) ->
parse_name([$), T | S], Acc, 0, State) ->
Type =
case T of
$d -> integer;
@ -190,11 +190,15 @@ parse_name([$), T | S], Acc, State) ->
["unknown type specifier '", T, "'"]})
end,
{lists:reverse(Acc), Type, S, State};
parse_name([$)], Acc, State) ->
parse_name([$)], Acc, 0, State) ->
throw({error, State#state.loc,
"expected type specifier, found end of string"});
parse_name([C | S], Acc, State) ->
parse_name(S, [C | Acc], State).
parse_name([$( = C | S], Acc, Depth, State) ->
parse_name(S, [C | Acc], Depth + 1, State);
parse_name([$) = C | S], Acc, Depth, State) ->
parse_name(S, [C | Acc], Depth - 1, State);
parse_name([C | S], Acc, Depth, State) ->
parse_name(S, [C | Acc], Depth, State).
make_sql_query(State) ->