aboutsummaryrefslogtreecommitdiff
path: root/src/odbc
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2010-06-04 13:31:34 +1000
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2010-06-04 13:31:34 +1000
commit4646a5dbb8d9d371fcacacc790e932f4dc123f5c (patch)
treeb9d840ba3677a616ec26e889830ec1555872d0dd /src/odbc
parentUpdate ejabberd version number to 2.1.4 (diff)
fixes wrong SQL escaping when --enable-full-xml is set
Diffstat (limited to 'src/odbc')
-rw-r--r--src/odbc/ejabberd_odbc.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index da18e0e1c..390cc44a6 100644
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -148,7 +148,9 @@ sql_query_t(Query) ->
%% Escape character that will confuse an SQL engine
escape(S) when is_list(S) ->
- [odbc_queries:escape(C) || C <- S].
+ [odbc_queries:escape(C) || C <- S];
+escape(S) when is_binary(S) ->
+ escape(binary_to_list(S)).
%% Escape character that will confuse an SQL engine
%% Percent and underscore only need to be escaped for pattern matching like