Fixed #7473: Client application crash when processing callback requests from server during attachDatabase

AlexPeshkoff · AlexPeshkoff · commit e1801225db99 · 2023-02-13T17:57:27.000+03:00
diff --git a/src/remote/client/interface.cpp b/src/remote/client/interface.cpp
@@ -8625,6 +8625,10 @@ static void receive_packet_with_callback(rem_port* port, PACKET* packet)
 		case op_crypt_key_callback:
 			{
 				P_CRYPT_CALLBACK* cc = &packet->p_cc;
+				Cleanup ccData([&cc]() {
+					cc->p_cc_data.cstr_length = 0;
+					cc->p_cc_data.cstr_address = nullptr;
+				});
 
 				if (port->port_client_crypt_callback)
 				{

Original file line number	Diff line number	Diff line change
`@@ -8625,6 +8625,10 @@ static void receive_packet_with_callback(rem_port* port, PACKET* packet)`
`8625`	`8625`	`case op_crypt_key_callback:`
`8626`	`8626`	`{`
`8627`	`8627`	`P_CRYPT_CALLBACK* cc = &packet->p_cc;`
	`8628`	`+ Cleanup ccData([&cc]() {`
	`8629`	`+ cc->p_cc_data.cstr_length = 0;`
	`8630`	`+ cc->p_cc_data.cstr_address = nullptr;`
	`8631`	`+ });`
`8628`	`8632`
`8629`	`8633`	`if (port->port_client_crypt_callback)`
`8630`	`8634`	`{`