romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 19:03:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix portability issue related with unaligned memory access

Browse source
This commit is contained in:
Yang Tse 2010-02-03 06:49:27 +00:00
parent f6d288a397
commit 381a4d6efe
2 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/rtsp.c
View file

@ -54,6 +54,11 @@
*/
#define RTP_PKT_CHANNEL(p) ((int)((unsigned char)((p)[1])))
#define RTP_PKT_LENGTH(p) ((((int)((unsigned char)((p)[2]))) << 8) | \
((int)((unsigned char)((p)[3]))))
static int rtsp_getsock_do(struct connectdata *conn,
curl_socket_t *socks,
int numsocks);
@ -544,16 +549,14 @@ CURLcode Curl_rtsp_rtp_readwrite(struct SessionHandle *data,
while((rtp_dataleft > 0) &&
(rtp[0] == '$')) {
if(rtp_dataleft > 4) {
char channel;
int rtp_length;
/* Parse the header */
/* The channel identifier immediately follows and is 1 byte */
channel = rtp[1];
rtspc->rtp_channel = (int) channel;
rtspc->rtp_channel = RTP_PKT_CHANNEL(rtp);
/* The length is two bytes */
rtp_length = ntohs( *((unsigned short *)(&rtp[2])) );
rtp_length = RTP_PKT_LENGTH(rtp);
if(rtp_dataleft < rtp_length + 4) {
/* Need more - incomplete payload*/