diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-11-06 16:29:16 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-11-06 16:29:16 +0000 |
| commit | e9e78af981865d676384373dcc5ee616e2b39209 (patch) | |
| tree | 4f2b4f7e5dd2dc056acd682204b466b73f64f3dc /channels | |
| parent | 02f6b79fc5a089fbee337e614a0508056ebf129a (diff) | |
Merged revisions 88994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88994 | file | 2007-11-06 12:24:56 -0400 (Tue, 06 Nov 2007) | 6 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@88995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 556cdc59c..bf416c7a8 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -1073,7 +1073,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; } @@ -13216,8 +13222,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_debug(1, "write fd not ready on channel %d\n", p->channel); continue; |