kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-28 15:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 152060 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r152060 | seanbright | 2008-10-26 16:25:08 -0400 (Sun, 26 Oct 2008) | 15 lines

Merged revisions 152059 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152059 | seanbright | 2008-10-26 16:23:36 -0400 (Sun, 26 Oct 2008) | 7 lines

Since passing \0 as the second argument to strchr is valid (and will
match the trailing \0 of a string) we need to check that first, otherwise
we end up with incorrect results.  Fix suggested by reporter.

(closes issue #13787)
Reported by: meitinger

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-10-26 20:27:42 +00:00
parent 3d3546fa0c
commit 3c1c4a3862
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
funcs/func_strings.c
View File

@@ -778,7 +778,10 @@ static int keypadhash(struct ast_channel *chan, const char *cmd, char *data, cha
char *bufptr, *dataptr;
for (bufptr = buf, dataptr = data; bufptr < buf + buflen - 1; dataptr++) {
if (*dataptr == '1') {
if (*dataptr == '\0') {
*bufptr++ = '\0';
break;
} else if (*dataptr == '1') {
*bufptr++ = '1';
} else if (strchr("AaBbCc2", *dataptr)) {
*bufptr++ = '2';
@@ -798,9 +801,6 @@ static int keypadhash(struct ast_channel *chan, const char *cmd, char *data, cha
*bufptr++ = '9';
} else if (*dataptr == '0') {
*bufptr++ = '0';
} else if (*dataptr == '\0') {
*bufptr++ = '\0';
break;
}
}
buf[buflen - 1] = '\0';