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
This commit is contained in:
parent
5bcb2dd715
commit
c90f58c8c9
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2361,7 +2361,7 @@ char *ast_realtime_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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -62,7 +62,7 @@ static void decode_chunk(char *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);
|
||||
}
|
||||
}
|
||||
|
|
Reference in New Issue