kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 198375 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r198375 | seanbright | 2009-05-30 16:11:33 -0400 (Sat, 30 May 2009) | 13 lines
  
  Properly terminate the receive buffer before sending to iksemel.
  
  aji_io_recv takes the maximum number of bytes to read (instead of the total
  buffer size), so we have to subtract 1 from our buffer size.  Without this, when
  we receive packets that are larger than our buffer, iksemel will choke and
  things get wonky.
  
  (closes issue #15232)
  Reported by: lp0
  Patches:
        05302009_res_jabber.c.patch uploaded by seanbright (license 71)
  Tested by: seanbright, lp0
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@198384 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2009-05-30 20:19:27 +00:00
parent 6b2d977b04
commit e9dea62cd7
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_jabber.c
View File

@@ -645,8 +645,8 @@ static int aji_io_recv(struct aji_client *client, char *buffer, size_t buf_len,
static int aji_recv (struct aji_client *client, int timeout) static int aji_recv (struct aji_client *client, int timeout)
{ {
int len, ret; int len, ret;
char buf[NET_IO_BUF_SIZE -1]; char buf[NET_IO_BUF_SIZE - 1];
char newbuf[NET_IO_BUF_SIZE -1]; char newbuf[NET_IO_BUF_SIZE - 1];
int pos = 0; int pos = 0;
int newbufpos = 0; int newbufpos = 0;
unsigned char c; unsigned char c;
@@ -655,7 +655,7 @@ static int aji_recv (struct aji_client *client, int timeout)
memset(newbuf, 0, sizeof(newbuf)); memset(newbuf, 0, sizeof(newbuf));
while (1) { while (1) {
len = aji_io_recv(client, buf, NET_IO_BUF_SIZE - 1, timeout); len = aji_io_recv(client, buf, NET_IO_BUF_SIZE - 2, timeout);
if (len < 0) return IKS_NET_RWERR; if (len < 0) return IKS_NET_RWERR;
if (len == 0) return IKS_NET_EXPIRED; if (len == 0) return IKS_NET_EXPIRED;
buf[len] = '\0'; buf[len] = '\0';
@@ -688,8 +688,18 @@ static int aji_recv (struct aji_client *client, int timeout)
ret = iks_parse(client->p, newbuf, 0, 0); ret = iks_parse(client->p, newbuf, 0, 0);
memset(newbuf, 0, sizeof(newbuf)); memset(newbuf, 0, sizeof(newbuf));
switch (ret) {
case IKS_NOMEM:
ast_log(LOG_WARNING, "Parsing failure: Out of memory.\n");
break;
case IKS_BADXML:
ast_log(LOG_WARNING, "Parsing failure: Invalid XML.\n");
break;
case IKS_HOOK:
ast_log(LOG_WARNING, "Parsing failure: Hook returned an error.\n");
break;
}
if (ret != IKS_OK) { if (ret != IKS_OK) {
ast_log(LOG_WARNING, "XML parsing failed\n");
return ret; return ret;
} }
ast_debug(3, "XML parsing successful\n"); ast_debug(3, "XML parsing successful\n");