Skip to content

Commit ff387ee

Browse files
authored
Merge commit from fork
* vulnerability fix * Stylistic changes
1 parent c8d60f3 commit ff387ee

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/remote/server/server.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7195,11 +7195,14 @@ SSHORT rem_port::asyncReceive(PACKET* asyncPacket, const UCHAR* buffer, SSHORT d
71957195
port_async->abort_aux_connection();
71967196
break;
71977197
case op_crypt_key_callback:
7198-
port_server_crypt_callback->wakeup(asyncPacket->p_cc.p_cc_data.cstr_length,
7199-
asyncPacket->p_cc.p_cc_data.cstr_address);
7198+
if (port_server_crypt_callback)
7199+
{
7200+
port_server_crypt_callback->wakeup(asyncPacket->p_cc.p_cc_data.cstr_length,
7201+
asyncPacket->p_cc.p_cc_data.cstr_address);
7202+
}
72007203
break;
72017204
case op_partial:
7202-
if (original_op == op_crypt_key_callback)
7205+
if (port_server_crypt_callback && original_op == op_crypt_key_callback)
72037206
port_server_crypt_callback->wakeup(0, NULL);
72047207
break;
72057208
default:

0 commit comments

Comments
 (0)