From: Jason Parker <jparker@digium.com>
Date: Fri, 27 Aug 2010 20:29:11 +0000 (+0000)
Subject: Fix issue with decoding ^-escaped characters in realtime.
X-Git-Tag: 1.4.37-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5c19c4c984e792ef3e5849e97d1dde7d01f244b;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.4@283880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index b735c0cd93..daed738d2f 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -68,7 +68,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);
 		}
 	}
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index f6cd7250be..beed9e2dd5 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -100,7 +100,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);
 		}
 	}