mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed leaks, NULL dereferences and broken init.

Browse Source
This commit is contained in:
Armin Novak 2015-06-23 21:29:21 +02:00
parent e5008d4b1b
commit 6698e24228
17 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/rail/client/rail_main.c
View File

@ -575,6 +575,8 @@ BOOL VCAPITYPE VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints)
CHANNEL_ENTRY_POINTS_FREERDP* pEntryPointsEx;
rail = (railPlugin*) calloc(1, sizeof(railPlugin));
if (!rail)
return FALSE;
rail->channelDef.options =
CHANNEL_OPTION_INITIALIZED |
@ -591,7 +593,10 @@ BOOL VCAPITYPE VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints)
{
context = (RailClientContext*) calloc(1, sizeof(RailClientContext));
if (!context)
{
free(rail);
return FALSE;
}
context->handle = (void*) rail;
context->custom = NULL;

4
client/Wayland/wlf_window.c
View File

@ -149,9 +149,9 @@ wlfWindow* wlf_CreateDesktopWindow(wlfContext* wlfc, char* name, int width, int
wlf_ResizeDesktopWindow(wlfc, window, width, height);
wl_surface_damage(window->surface, 0, 0, window->width, window->height);
}
wlf_SetWindowText(wlfc, window, name);
wlf_SetWindowText(wlfc, window, name);
}
return window;
}

2
client/X11/xf_tsmf.c
View File

@ -187,6 +187,7 @@ int xf_tsmf_xv_video_frame_event(TsmfClientContext* tsmf, TSMF_VIDEO_FRAME_EVENT
else
{
WLog_DBG(TAG, "pixel format 0x%X not supported by hardware.", pixfmt);
free(xrects);
return -1003;
}
@ -213,6 +214,7 @@ int xf_tsmf_xv_video_frame_event(TsmfClientContext* tsmf, TSMF_VIDEO_FRAME_EVENT
if (!XShmAttach(xfc->display, &shminfo))
{
XFree(image);
free(xrects);
WLog_DBG(TAG, "XShmAttach failed.");
return -1004;
}

5
libfreerdp/codec/rfx.c
View File

@ -966,10 +966,9 @@ static BOOL rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* messa
WaitForThreadpoolWorkCallbacks(work_objects[i], FALSE);
CloseThreadpoolWork(work_objects[i]);
}
free(work_objects);
free(params);
}
free(work_objects);
free(params);
for (i = 0; i < message->numTiles; i++)
{

2
libfreerdp/common/assistance.c
View File

@ -184,7 +184,7 @@ int freerdp_assistance_parse_address_list(rdpAssistanceFile* file, char* list)
file->MachinePorts[i] = (UINT32) atoi(q);
if (!file->MachineAddresses[i])
return -1;
goto out;
q[-1] = ':';
}

7
libfreerdp/common/settings.c
View File

@ -117,7 +117,11 @@ int freerdp_addin_set_argument_value(ADDIN_ARGV* args, char* option, char* value
new_argv = (char**) realloc(args->argv, sizeof(char*) * (args->argc + 1));
if (!new_argv)
{
free(str);
return -1;
}
args->argv = new_argv;
args->argc++;
args->argv[args->argc - 1] = str;
@ -151,7 +155,10 @@ int freerdp_addin_replace_argument_value(ADDIN_ARGV* args, char* previous, char*
new_argv = (char**) realloc(args->argv, sizeof(char*) * (args->argc + 1));
if (!new_argv)
{
free(str);
return -1;
}
args->argv = new_argv;
args->argc++;
args->argv[args->argc - 1] = str;

6
libfreerdp/core/gateway/http.c
View File

@ -615,7 +615,7 @@ HttpResponse* http_response_recv(rdpTls* tls)
int position;
char* line;
char* buffer;
char* header;
char* header = NULL;
char* payload;
int bodyLength;
int payloadOffset;
@ -728,8 +728,6 @@ HttpResponse* http_response_recv(rdpTls* tls)
count++;
}
free(header);
if (!http_response_parse_header(response))
goto out_error;
@ -779,10 +777,12 @@ HttpResponse* http_response_recv(rdpTls* tls)
}
}
free(header);
Stream_Free(s, TRUE);
return response;
out_error:
http_response_free(response);
free(header);
out_free:
Stream_Free(s, TRUE);
return NULL;

2
libfreerdp/core/metrics.c
View File

@ -25,7 +25,7 @@
double metrics_write_bytes(rdpMetrics* metrics, UINT32 UncompressedBytes, UINT32 CompressedBytes)
{
double CompressionRatio;
double CompressionRatio = 0.0;
metrics->TotalUncompressedBytes += UncompressedBytes;
metrics->TotalCompressedBytes += CompressedBytes;

2
libfreerdp/core/redirection.c
View File

@ -207,7 +207,7 @@ int rdp_redirection_apply_settings(rdpRdp* rdp)
settings->TargetNetAddresses[i] = _strdup(redirection->TargetNetAddresses[i]);
if (!settings->TargetNetAddresses[i])
{
for (--i; i >= 0; --i)
for (; i > 0; --i)
free(settings->TargetNetAddresses[i]);
return -1;
}

21
libfreerdp/core/settings.c
View File

@ -786,6 +786,13 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
goto out_fail;
}
if (_settings->DeviceArraySize < _settings->DeviceCount)
{
_settings->DeviceCount = 0;
_settings->DeviceArraySize = 0;
goto out_fail;
}
for (index = 0; index < _settings->DeviceCount; index++)
{
_settings->DeviceArray[index] = freerdp_device_clone(settings->DeviceArray[index]);
@ -803,6 +810,13 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
goto out_fail;
}
if (_settings->StaticChannelArraySize < _settings->StaticChannelCount)
{
_settings->StaticChannelArraySize = 0;
_settings->ChannelCount = 0;
goto out_fail;
}
for (index = 0; index < _settings->StaticChannelCount; index++)
{
_settings->StaticChannelArray[index] = freerdp_static_channel_clone(settings->StaticChannelArray[index]);
@ -820,6 +834,13 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
goto out_fail;
}
if (_settings->DynamicChannelArraySize < _settings->DynamicChannelCount)
{
_settings->DynamicChannelCount = 0;
_settings->DynamicChannelArraySize = 0;
goto out_fail;
}
for (index = 0; index < _settings->DynamicChannelCount; index++)
{
_settings->DynamicChannelArray[index] = freerdp_dynamic_channel_clone(settings->DynamicChannelArray[index]);

1
libfreerdp/crypto/crypto.c
View File

@ -483,6 +483,7 @@ char** crypto_cert_subject_alt_name(X509* xcert, int* count, int** lengths)
if (!*lengths)
{
free(strings);
strings = NULL;
goto out;
}
}

1
libfreerdp/gdi/dc.c
View File

@ -105,7 +105,6 @@ HGDI_DC gdi_CreateDC(UINT32 flags, int bpp)
fail:
gdi_DeleteDC(hDC);
free(hDC);
return NULL;
}

3
winpr/libwinpr/asn1/asn1.c
View File

@ -117,7 +117,8 @@ LABEL_ENCODER_COMPLETE:
{
//if (ASN1BEREncCheck(encoder, 1))
{
*encoder->buf = 0;
if (encoder->buf)
*encoder->buf = 0;
LABEL_SET_BUFFER:
if (pParent)
pParent[1].version = (ASN1uint32_t) encoder;

8
winpr/libwinpr/pipe/test/TestPipeCreateNamedPipeOverlapped.c
View File

@ -19,10 +19,10 @@ static LPTSTR lpszPipeName = _T("\\\\.\\pipe\\winpr_test_pipe_overlapped");
static void* named_pipe_client_thread(void* arg)
{
DWORD status;
HANDLE hEvent;
HANDLE hNamedPipe;
BYTE* lpReadBuffer;
BYTE* lpWriteBuffer;
HANDLE hEvent = NULL;
HANDLE hNamedPipe = NULL;
BYTE* lpReadBuffer = NULL;
BYTE* lpWriteBuffer = NULL;
BOOL fSuccess = FALSE;
OVERLAPPED overlapped;
DWORD nNumberOfBytesToRead;

1
winpr/libwinpr/shell/shell.c
View File

@ -78,6 +78,7 @@ BOOL GetUserProfileDirectoryA(HANDLE hToken, LPSTR lpProfileDir, LPDWORD lpcchSi
if ((status != 0) || !pw)
{
SetLastError(ERROR_INVALID_PARAMETER);
free (buf);
return FALSE;
}

10
winpr/libwinpr/utils/collections/Reference.c
View File

@ -157,19 +157,19 @@ wReferenceTable* ReferenceTable_New(BOOL synchronized, void* context, REFERENCE_
{
wReferenceTable* referenceTable;
referenceTable = (wReferenceTable*) malloc(sizeof(wReferenceTable));
referenceTable = (wReferenceTable*) calloc(1, sizeof(wReferenceTable));
if (!referenceTable)
return NULL;
referenceTable->array = (wReference*) calloc(1, sizeof(wReference) * referenceTable->size);
if (!referenceTable->array)
goto error_array;
referenceTable->context = context;
referenceTable->ReferenceFree = ReferenceFree;
referenceTable->size = 32;
referenceTable->array = (wReference*) calloc(referenceTable->size, sizeof(wReference));
if (!referenceTable->array)
goto error_array;
referenceTable->synchronized = synchronized;
if (synchronized && !InitializeCriticalSectionAndSpinCount(&referenceTable->lock, 4000))
goto error_critical_section;

3
winpr/libwinpr/utils/sam.c
View File

@ -239,7 +239,10 @@ WINPR_SAM_ENTRY* SamLookupUserA(WINPR_SAM* sam, LPSTR User, UINT32 UserLength, L
return NULL;
if (!SamLookupStart(sam))
{
free(entry);
return NULL;
}
while (sam->line != NULL)
{