[asterisk-commits] qwell: branch 1.4 r283880 - /branches/1.4/res/

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Aug 27 15:29:11 2010
New Revision: 283880

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283880
Log:
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

Modified:
    branches/1.4/res/res_config_odbc.c
    branches/1.4/res/res_config_pgsql.c

Modified: branches/1.4/res/res_config_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_config_odbc.c?view=diff&rev=283880&r1=283879&r2=283880
==============================================================================
--- branches/1.4/res/res_config_odbc.c (original)
+++ branches/1.4/res/res_config_odbc.c Fri Aug 27 15:29:11 2010
@@ -68,7 +68,7 @@
 {
 	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);
 		}
 	}

Modified: branches/1.4/res/res_config_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_config_pgsql.c?view=diff&rev=283880&r1=283879&r2=283880
==============================================================================
--- branches/1.4/res/res_config_pgsql.c (original)
+++ branches/1.4/res/res_config_pgsql.c Fri Aug 27 15:29:11 2010
@@ -100,7 +100,7 @@
 	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);
 		}
 	}