maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-847: Merge fix for leaked RDPSND packet memory.

Browse Source
This commit is contained in:
Mike Jumper 2019-07-20 12:15:18 -07:00 committed by GitHub
commit 41b0c21322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c
View File

@ -110,35 +110,36 @@ void guac_rdpsnd_process_receive(rdpSvcPlugin* plugin,
* If next PDU is SNDWAVE (due to receiving WaveInfo PDU previously), * If next PDU is SNDWAVE (due to receiving WaveInfo PDU previously),
* ignore the header and parse as a Wave PDU. * ignore the header and parse as a Wave PDU.
*/ */
if (rdpsnd->next_pdu_is_wave) { if (rdpsnd->next_pdu_is_wave)
guac_rdpsnd_wave_handler(rdpsnd, input_stream, &header); guac_rdpsnd_wave_handler(rdpsnd, input_stream, &header);
return;
}
/* Dispatch message to standard handlers */ /* Dispatch message to standard handlers */
switch (header.message_type) { else {
switch (header.message_type) {
/* Server Audio Formats and Version PDU */ /* Server Audio Formats and Version PDU */
case SNDC_FORMATS: case SNDC_FORMATS:
guac_rdpsnd_formats_handler(rdpsnd, input_stream, &header); guac_rdpsnd_formats_handler(rdpsnd, input_stream, &header);
break; break;
/* Training PDU */ /* Training PDU */
case SNDC_TRAINING: case SNDC_TRAINING:
guac_rdpsnd_training_handler(rdpsnd, input_stream, &header); guac_rdpsnd_training_handler(rdpsnd, input_stream, &header);
break; break;
/* WaveInfo PDU */ /* WaveInfo PDU */
case SNDC_WAVE: case SNDC_WAVE:
guac_rdpsnd_wave_info_handler(rdpsnd, input_stream, &header); guac_rdpsnd_wave_info_handler(rdpsnd, input_stream, &header);
break; break;
/* Close PDU */ /* Close PDU */
case SNDC_CLOSE: case SNDC_CLOSE:
guac_rdpsnd_close_handler(rdpsnd, input_stream, &header); guac_rdpsnd_close_handler(rdpsnd, input_stream, &header);
break; break;
}
} }
Stream_Free(input_stream, TRUE);
} }