diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-02 00:58:43 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-02 00:58:43 +0000 |
| commit | 3b31fc37af23c0e21791a6c9b813a3aa7a10072b (patch) | |
| tree | f28aa4e6b7b5ea3cb18081165df37c7bd0ef9c16 /channels/chan_features.c | |
| parent | b6affabc9ef8c64b3f5a542507f2df2f71e9625a (diff) | |
Merged revisions 160208 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r160208 | tilghman | 2008-12-01 18:37:21 -0600 (Mon, 01 Dec 2008) | 10 lines
Merged revisions 160207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r160207 | tilghman | 2008-12-01 18:25:16 -0600 (Mon, 01 Dec 2008) | 3 lines
Ensure that Asterisk builds with --enable-dev-mode, even on the latest gcc
and glibc.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@160234 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_features.c')
| -rw-r--r-- | channels/chan_features.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_features.c b/channels/chan_features.c index 3c41eb73e..991cccf5f 100644 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -449,7 +449,11 @@ static struct ast_channel *features_new(struct feature_pvt *p, int state, int id for (x=1;x<4;x++) { if (b2) ast_free(b2); - asprintf(&b2, "%s/%s-%d", p->tech, p->dest, x); + if (asprintf(&b2, "%s/%s-%d", p->tech, p->dest, x) < 0) { + ast_log(LOG_WARNING, "Unable to create channel name: %s\n", strerror(errno)); + b2 = NULL; + continue; + } for (y=0;y<3;y++) { if (y == idx) continue; |