From: Joshua Colp <jcolp@digium.com>
Date: Tue, 6 Nov 2007 16:24:56 +0000 (+0000)
Subject: Fix improbable but possible memory leaks in chan_zap.
X-Git-Tag: 1.4.14~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b309c7bb9f2b58b76582004a78d0a5970b8fea0;p=thirdparty%2Fasterisk.git

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/branches/1.4@88994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index d694fd0a33..11165ae046 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;