[svn-commits] tilghman: branch 1.8 r298482 - in /branches/1.8: ./ res/res_config_odbc.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Dec 16 03:05:28 2010
New Revision: 298482

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298482
Log:
Merged revisions 298481 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r298481 | tilghman | 2010-12-16 03:04:38 -0600 (Thu, 16 Dec 2010) | 21 lines
  
  Merged revisions 298480 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r298480 | tilghman | 2010-12-16 03:03:40 -0600 (Thu, 16 Dec 2010) | 14 lines
    
    Only increment the pointer once per loop, otherwise we corrupt the value.
    
    (closes issue #18251)
     Reported by: bcnit
     Patches: 
           20101110__issue18251.diff.txt uploaded by tilghman (license 14)
     Tested by: trev, jthurman, elguero
    
    (closes issue #18279)
     Reported by: zerohalo
     Patches: 
           20101109__issue18279.diff.txt uploaded by tilghman (license 14)
     Tested by: zerohalo
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/res/res_config_odbc.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/res/res_config_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_config_odbc.c?view=diff&rev=298482&r1=298481&r2=298482
==============================================================================
--- branches/1.8/res/res_config_odbc.c (original)
+++ branches/1.8/res/res_config_odbc.c Thu Dec 16 03:05:28 2010
@@ -61,7 +61,7 @@
 static void decode_chunk(char *chunk)
 {
 	for (; *chunk; chunk++) {
-		if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
+		if (*chunk == '^' && strchr("0123456789ABCDEF", chunk[1]) && strchr("0123456789ABCDEF", chunk[2])) {
 			sscanf(chunk + 1, "%02hhX", chunk);
 			memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
 		}
@@ -109,9 +109,8 @@
 					/* We use ^XX, instead of %XX because '%' is a special character in SQL */
 					snprintf(eptr, encodebuf + sizeof(encodebuf) - eptr, "^%02hhX", *vptr);
 					eptr += 3;
-					vptr++;
 				} else {
-					*eptr++ = *vptr++;
+					*eptr++ = *vptr;
 				}
 			}
 			if (eptr < encodebuf + sizeof(encodebuf)) {