stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix dropmask dereference even when NULL

Browse source 
Signed-off-by: Nikolay Dimitrov <ndimitrov@setelis.com>
This commit is contained in:
Nikolay Dimitrov 2013-12-21 10:22:17 +08:00 • committed by Andy Green
parent 0a0a7ebc37
commit a8268e7619
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/output.c
View file

@ -555,14 +555,15 @@ do_more_inside_frame:
/*
* in v7, just mask the payload
*/
for (n = 4; n < (int)len + 4; n++)
dropmask[n] = dropmask[n] ^
if (dropmask) { /* never set if already inside frame */
for (n = 4; n < (int)len + 4; n++)
dropmask[n] = dropmask[n] ^
wsi->u.ws.frame_masking_nonce_04[
(wsi->u.ws.frame_mask_index++) & 3];
if (dropmask) /* never set if already inside frame */
/* copy the frame nonce into place */
memcpy(dropmask, wsi->u.ws.frame_masking_nonce_04, 4);
}
}
send_raw: