kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 246200 via svnmerge from

Browse Source 
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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@246202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-02-10 21:21:26 +00:00
parent 5413868305
commit 27619090b2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
funcs/func_strings.c
View File

@@ -87,7 +87,8 @@ static int filter(struct ast_channel *chan, const char *cmd, char *parse, char *
AST_APP_ARG(allowed); AST_APP_ARG(allowed);
AST_APP_ARG(string); AST_APP_ARG(string);
); );
char *outbuf = buf, ac; char *outbuf = buf;
unsigned char ac;
char allowed[256] = ""; char allowed[256] = "";
size_t allowedlen = 0; size_t allowedlen = 0;
int32_t bitfield[8] = { 0, }; /* 256 bits */ int32_t bitfield[8] = { 0, }; /* 256 bits */
@@ -104,7 +105,7 @@ static int filter(struct ast_channel *chan, const char *cmd, char *parse, char *
} }
/* Expand ranges */ /* Expand ranges */
for (; *(args.allowed) && allowedlen < sizeof(allowed); ) { for (; *(args.allowed);) {
char c1 = 0, c2 = 0; char c1 = 0, c2 = 0;
size_t consumed = 0; size_t consumed = 0;
@@ -128,13 +129,13 @@ static int filter(struct ast_channel *chan, const char *cmd, char *parse, char *
for (ac = c1; ac != c2; ac++) { for (ac = c1; ac != c2; ac++) {
bitfield[ac / 32] |= 1 << (ac % 32); bitfield[ac / 32] |= 1 << (ac % 32);
} }
bitfield[ac / 32] |= 1 << (ac % 32);
ast_debug(4, "c1=%d, c2=%d\n", c1, c2); ast_debug(4, "c1=%d, c2=%d\n", c1, c2);
/* Decrement before the loop increment */
(args.allowed)--;
} else { } 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);
} }
} }