diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-06 16:24:56 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-06 16:24:56 +0000 |
| commit | 6dba2f72ba02725115247b0da1f6a6af426d641e (patch) | |
| tree | a801f2ba367c60152719fe072455837afcec021f /channels | |
| parent | 0862156dc17379a29e8783fd2f7c352583911130 (diff) | |
Fix improbable but possible memory leaks in chan_zap.
(closes issue #11166)
Reported by: eliel
Patches:
chan_zap.c.patch uploaded by eliel (license 64)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@88994 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index d694fd0a3..11165ae04 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -905,7 +905,13 @@ static int zt_open(char *fn) } } bs = READ_SIZE; - if (ioctl(fd, ZT_SET_BLOCKSIZE, &bs) == -1) return -1; + if (ioctl(fd, ZT_SET_BLOCKSIZE, &bs) == -1) { + ast_log(LOG_WARNING, "Unable to set blocksize '%d': %s\n", bs, strerror(errno)); + x = errno; + close(fd); + errno = x; + return -1; + } return fd; } @@ -11406,8 +11412,10 @@ static int zt_sendtext(struct ast_channel *c, const char *text) continue; } /* if got exception */ - if (fds[0].revents & POLLPRI) + if (fds[0].revents & POLLPRI) { + ast_free(mybuf); return -1; + } if (!(fds[0].revents & POLLOUT)) { ast_log(LOG_DEBUG, "write fd not ready on channel %d\n", p->channel); continue; |