diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 07:34:59 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 07:34:59 +0000 |
| commit | 766e2cf21b733de816576face836b811edf8ffae (patch) | |
| tree | a27725ccf9ca142376c9db2768d8edbd29451690 /channels | |
| parent | 19db6fdb2a229336d1436d39b42ffdf53266531d (diff) | |
Fix a potential integer signedness problem.
Also fix some locking issues I found at the same time.
Issue 7770, original patch by alamantia
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40757 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_skinny.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 4d31969dc..acd6ad951 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3927,12 +3927,19 @@ static int get_input(struct skinnysession *s) res = read(s->fd, s->inbuf, 4); if (res < 0) { ast_log(LOG_WARNING, "read() returned error: %s\n", strerror(errno)); + ast_mutex_unlock(&s->lock); return res; } else if (res != 4) { ast_log(LOG_WARNING, "Skinny Client sent less data than expected. Expected 4 but got %d.\n", res); + ast_mutex_unlock(&s->lock); return -1; } dlen = letohl(*(int *)s->inbuf); + if (dlen < 0) { + ast_log(LOG_WARNING, "Skinny Client sent invalid data.\n"); + ast_mutex_unlock(&s->lock); + return -1; + } if (dlen+8 > sizeof(s->inbuf)) { dlen = sizeof(s->inbuf) - 8; } |