github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core,transport] only free userContext if userContextSize > 0

Browse Source
This commit is contained in:
Armin Novak 2025-05-28 09:43:39 +02:00
parent 07ceeb1f91
commit 7a89e47334
No known key found for this signature in database
GPG Key ID: 2CF4A2D2D3D72105
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/freerdp/transport_io.h
View File

@ -148,8 +148,12 @@ extern "C"
/**
* @brief Create new transport layer instance
*
* @bug Before 3.16.0 the rdpTransportLayer::userContext was freed unconditionally
*
* @param transport A pointer to the transport instance to use
* @param contextSize The size of the context to use
* @param contextSize The size of the context to use. If \b 0 no rdpTransportLayer::userContext
* is allocated or freed.
* @return A new transport layer instance or \b NULL in case of failure
* @since version 3.9.0
*/

22
libfreerdp/core/transport.c
View File

@ -97,6 +97,12 @@ struct rdp_transport
BOOL earlyUserAuth;
};
typedef struct
{
rdpTransportLayer pub;
void* userContextShadowPtr;
} rdpTransportLayerInt;
static void transport_ssl_cb(const SSL* ssl, int where, int ret)
{
if (where & SSL_CB_ALERT)
@ -1911,31 +1917,33 @@ void transport_set_early_user_auth_mode(rdpTransport* transport, BOOL EUAMode)
rdpTransportLayer* transport_layer_new(WINPR_ATTR_UNUSED rdpTransport* transport,
size_t contextSize)
{
rdpTransportLayer* layer = (rdpTransportLayer*)calloc(1, sizeof(rdpTransportLayer));
rdpTransportLayerInt* layer = (rdpTransportLayerInt*)calloc(1, sizeof(rdpTransportLayerInt));
if (!layer)
return NULL;
if (contextSize)
{
layer->userContext = calloc(1, contextSize);
if (!layer->userContext)
layer->userContextShadowPtr = calloc(1, contextSize);
if (!layer->userContextShadowPtr)
{
free(layer);
return NULL;
}
}
layer->pub.userContext = layer->userContextShadowPtr;
return layer;
return &layer->pub;
}
void transport_layer_free(rdpTransportLayer* layer)
{
rdpTransportLayerInt* intern = (rdpTransportLayerInt*)layer;
if (!layer)
return;
IFCALL(layer->Close, layer->userContext);
free(layer->userContext);
free(layer);
IFCALL(intern->pub.Close, intern->pub.userContext);
free(intern->userContextShadowPtr);
free(intern);
}
static int transport_layer_bio_write(BIO* bio, const char* buf, int size)