Skip to content
Snippets Groups Projects
Commit 81df8343 authored by Mark Spencer's avatar Mark Spencer
Browse files

Only accept first callerid number (bug #2395)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 388ca075
Branches
Tags
No related merge requests found
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* *
* CallerID Generation support * CallerID Generation support
* *
* Copyright (C) 2001, Linux Support Services, Inc. * Copyright (C) 2001-2004, Digium, Inc.
* *
* Mark Spencer <markster@linux-support.net> * Mark Spencer <markster@digium.com>
* *
* This program is free software, distributed under the terms of * This program is free software, distributed under the terms of
* the GNU General Public License. * the GNU General Public License.
...@@ -261,9 +261,11 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int ...@@ -261,9 +261,11 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
ast_log(LOG_NOTICE, "Truncating long caller ID number from %d bytes to 32\n", cid->rawdata[x]); ast_log(LOG_NOTICE, "Truncating long caller ID number from %d bytes to 32\n", cid->rawdata[x]);
res = 32; res = 32;
} }
memcpy(cid->number, cid->rawdata + x + 1, res); if (ast_strlen_zero(cid->number)) {
/* Null terminate */ memcpy(cid->number, cid->rawdata + x + 1, res);
cid->number[res] = '\0'; /* Null terminate */
cid->number[res] = '\0';
}
break; break;
case 7: /* Name */ case 7: /* Name */
case 8: /* Name */ case 8: /* Name */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment