aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-02 00:37:21 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-02 00:37:21 +0000
commitad1d52df72bcc07b11215133217dea1fae1419b1 (patch)
tree36a15e8926ad865d79c9b2dda57bfcb7c4aa42a3 /channels
parentf7c1d2a4bc42698f9fe58e9d90e7313ffd27cd89 (diff)
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/trunk@160208 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_features.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 5da503f4c..49400ad60 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;