aboutsummaryrefslogtreecommitdiffstats
path: root/addons
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-27 20:32:21 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-27 20:32:21 +0000
commitc90f58c8c9a5da66f419450a10c731a63ae5bf7a (patch)
tree850cb33b75fc074b76a2d7cf8a52d5fa3ebaa65e /addons
parent5bcb2dd715d4dcf66e01451341419cf79ac7f620 (diff)
Merged revisions 283882 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r283882 | qwell | 2010-08-27 15:31:55 -0500 (Fri, 27 Aug 2010) | 22 lines Merged revisions 283881 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r283881 | qwell | 2010-08-27 15:30:27 -0500 (Fri, 27 Aug 2010) | 15 lines Merged revisions 283880 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r283880 | qwell | 2010-08-27 15:29:11 -0500 (Fri, 27 Aug 2010) | 8 lines Fix issue with decoding ^-escaped characters in realtime. (closes issue #17790) Reported by: denzs Patches: 17790-chunky.diff uploaded by qwell (license 4) Tested by: qwell, denzs ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@283883 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'addons')
-rw-r--r--addons/res_config_mysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index e770452fd..1ba522485 100644
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -307,7 +307,7 @@ static char *decode_chunk(char *chunk)
char *orig = chunk;
for (; *chunk; chunk++) {
if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
- sscanf(chunk + 1, "%02hhd", chunk);
+ sscanf(chunk + 1, "%02hhX", chunk);
memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
}
}