[svn-commits] tilghman: branch 1.6.1 r246202 - in /branches/1.6.1: ./ funcs/func_strings.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Feb 10 15:21:26 2010
New Revision: 246202

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246202
Log:
Merged revisions 246200 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r246200 | tilghman | 2010-02-10 15:19:35 -0600 (Wed, 10 Feb 2010) | 2 lines
  
  Fix weird issue with unit tests on optimized build - turned out to be a signing issue.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_strings.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_strings.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/funcs/func_strings.c?view=diff&rev=246202&r1=246201&r2=246202
==============================================================================
--- branches/1.6.1/funcs/func_strings.c (original)
+++ branches/1.6.1/funcs/func_strings.c Wed Feb 10 15:21:26 2010
@@ -87,7 +87,8 @@
 			     AST_APP_ARG(allowed);
 			     AST_APP_ARG(string);
 	);
-	char *outbuf = buf, ac;
+	char *outbuf = buf;
+	unsigned char ac;
 	char allowed[256] = "";
 	size_t allowedlen = 0;
 	int32_t bitfield[8] = { 0, }; /* 256 bits */
@@ -104,7 +105,7 @@
 	}
 
 	/* Expand ranges */
-	for (; *(args.allowed) && allowedlen < sizeof(allowed); ) {
+	for (; *(args.allowed);) {
 		char c1 = 0, c2 = 0;
 		size_t consumed = 0;
 
@@ -128,13 +129,13 @@
 			for (ac = c1; ac != c2; ac++) {
 				bitfield[ac / 32] |= 1 << (ac % 32);
 			}
+			bitfield[ac / 32] |= 1 << (ac % 32);
 
 			ast_debug(4, "c1=%d, c2=%d\n", c1, c2);
-
-			/* Decrement before the loop increment */
-			(args.allowed)--;
 		} else {
-			bitfield[c1 / 32] |= 1 << (c1 % 32);
+			ac = (unsigned char) c1;
+			ast_debug(4, "c1=%d, consumed=%d, args.allowed=%s\n", c1, consumed, args.allowed - consumed);
+			bitfield[ac / 32] |= 1 << (ac % 32);
 		}
 	}