From e5d6fd05a08bf3d079d957ff50f9a2f1dd2666a7 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Sat, 25 Jul 2009 06:25:30 +0000 Subject: Merged revisions 208749 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r208749 | jpeeler | 2009-07-25 01:23:18 -0500 (Sat, 25 Jul 2009) | 13 lines Merged revisions 208746 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r208746 | jpeeler | 2009-07-25 01:19:50 -0500 (Sat, 25 Jul 2009) | 7 lines Fix compiling under dev-mode with gcc 4.4.0. Mostly trivial changes, but I did not know of any other way to fix the "dereferencing type-punned pointer will break strict-aliasing rules" error without creating a tmp variable in chan_skinny. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@208754 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_skinny.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'channels/chan_skinny.c') diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 5f649fbd1..67fefbad9 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -5887,6 +5887,7 @@ static int get_input(struct skinnysession *s) { int res; int dlen = 0; + int *bufaddr; struct pollfd fds[1]; fds[0].fd = s->fd; @@ -5933,7 +5934,8 @@ static int get_input(struct skinnysession *s) return -1; } - dlen = letohl(*(int *)s->inbuf); + bufaddr = (int *)s->inbuf; + dlen = letohl(*bufaddr); if (dlen < 4) { ast_debug(1, "Skinny Client sent invalid data.\n"); ast_mutex_unlock(&s->lock); @@ -5942,7 +5944,7 @@ static int get_input(struct skinnysession *s) if (dlen+8 > sizeof(s->inbuf)) { dlen = sizeof(s->inbuf) - 8; } - *(int *)s->inbuf = htolel(dlen); + *bufaddr = htolel(dlen); res = read(s->fd, s->inbuf+4, dlen+4); ast_mutex_unlock(&s->lock); @@ -5961,13 +5963,15 @@ static int get_input(struct skinnysession *s) static struct skinny_req *skinny_req_parse(struct skinnysession *s) { struct skinny_req *req; + int *bufaddr; if (!(req = ast_calloc(1, SKINNY_MAX_PACKET))) return NULL; ast_mutex_lock(&s->lock); memcpy(req, s->inbuf, skinny_header_size); - memcpy(&req->data, s->inbuf+skinny_header_size, letohl(*(int*)(s->inbuf))-4); + bufaddr = (int *)(s->inbuf); + memcpy(&req->data, s->inbuf+skinny_header_size, letohl(*bufaddr)-4); ast_mutex_unlock(&s->lock); -- cgit v1.2.3